Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix private header inclusion of opcolor.h #1053

Merged
merged 3 commits into from Sep 6, 2019

Conversation

@marsupial
Copy link
Contributor

commented Aug 31, 2019

Description

Fixes reliance on liboslexec/opcolor.h in client code.
There isn't a super-great simple-solution here while still keeping liboptix out of liboslexec.

Final version seem like it should be extensible enough to at least handle other data upload that needs to convert device strings...but uploading OCIO transforms will probably change all of this anyway?

jermainedupris added 3 commits Aug 31, 2019
jermainedupris
Extend ShadingSystem::getattribute of type pointer's to also return t…
…he size of the pointer.

Add "colorsystem:colorspace" to ShadingSystem::getattribute.
Remove private include of opcolor.h.
@lgritz

This comment has been minimized.

Copy link
Member

commented Sep 6, 2019

LGTM, I think. I'll test it tomorrow and merge if all seems ok on my workstation with optix.

@lgritz

This comment has been minimized.

Copy link
Member

commented Sep 6, 2019

Tests seem fine on my workstation, merging.

@lgritz lgritz merged commit f0a0039 into imageworks:master Sep 6, 2019

1 of 2 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.