MAYA-111902 Fix MaterialX import errors found by testing #1553
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
And add rountrip unit test.
JGamache-autodesk
changed the title
kxl-adsk
approved these changes
Jul 6, 2021
lib/mayaUsd/CMakeLists.txt
Outdated
| endif() | ||
|
|
||
| if (MAYA_API_VERSION VERSION_GREATER_EQUAL 20230000 AND UFE_VERSION VERSION_GREATER_EQUAL 2.0.3) | ||
| if (MAYA_DEFAULT_MATERIAL_API EQUAL 1) |
There was a problem hiding this comment.
Some recent build breaks have cast doubt on these combinations of versions. FindMaya.cmake now makes sure the API is correctly detected.
williamkrick
approved these changes
Jul 7, 2021
cmake/modules/FindMaya.cmake
Outdated
| file(STRINGS ${MAYA_OPENMAYARENDER_LIBRARY} HAS_DEFAULT_MATERIAL_API REGEX "setDefaultMaterialHandling") | ||
| if (HAS_DEFAULT_MATERIAL_API) | ||
| set(MAYA_DEFAULT_MATERIAL_API 1) | ||
| message(STATUS "This version of Maya has the default material API") |
There was a problem hiding this comment.
I always like the log to print the name of the env var as well, so I can ctrl+f in the log to check the value that was used.
There was a problem hiding this comment.
I added a bit more output at the two key detection moments.
cmake/modules/FindMaya.cmake
Outdated
| NO_CMAKE_SYSTEM_PATH | ||
| ) | ||
| if (MAYA_OPENMAYARENDER_LIBRARY) | ||
| file(STRINGS ${MAYA_OPENMAYARENDER_LIBRARY} HAS_DEFAULT_MATERIAL_API REGEX "setDefaultMaterialHandling") |
There was a problem hiding this comment.
This is a good idea and I'm wondering if we should use it more generally. Does it take much time to run the search?
There was a problem hiding this comment.
It was quite fast, but it will be even faster (and more precise) to look directly in the header file. Fixed that.
williamkrick
approved these changes
Jul 7, 2021
williamkrick
approved these changes
Jul 7, 2021
JGamache-autodesk
added
the
ready-for-merge
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.
Fixes roughness not exporting correctly for UsdPreviewSurface node in MaterialX
Fixes UsdPreviewSurface not importing from MaterialX
Adds MaterialX mode to UsdPreviewSurface rountrip unit test.