Adjust for recent OIIO master change -- ImageInput no longer has m_mutex #1281
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
While we're in there, get rid of some cruft that only applied to OIIO 1.x. Signed-off-by: Larry Gritz <[email protected]>
|
Emergency merge without review because it's so obviously broken without this patch. |
lgritz
added a commit
to lgritz/OpenShadingLanguage
that referenced
this pull request
Oct 27, 2020
…tex (AcademySoftwareFoundation#1281) While we're in there, get rid of some cruft that only applied to OIIO 1.x. Signed-off-by: Larry Gritz <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While we're in there, get rid of some cruft that only applied to
OIIO 1.x.
Signed-off-by: Larry Gritz [email protected]