Merge fix-7.2.5 to master #1858
Merged
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
(cherry picked from commit 2fcc262)
…render delegate (Autodesk#1777) * add test for Autodesk#1776 * Initialize the rotation matrix with the quad directly * update changelog for Autodesk#1776
…ndering in Solaris" (Autodesk#1811)
… by Arnold (Autodesk#1813) * Improve material network creation by caching the nodes returned by arnold * optimize further by first checking if the shader is an arnold shader * move shader node entry and osl code cache in the render delegate and use lock/mutex * cache materialx nodes only
* fix build with older versions of arnold * fix compatibility with older versions of arnold * convert AtString to string * allow materialx for versions > 7.1.4 * fix ifdef versions for materialx * compatibility with older arnold versions
…todesk#1830) * make the UsdArnoldReaderRegistry non static * register readers before reading
…procedural code (Autodesk#1832) * read the matrix in the ArnoldProceduralCustom procedural reader * update test_0739 reference image
…htoa_pygeo lookup to scripts/bin/htoa_geo.dll (Autodesk#1850)
* update fix-7.2.5 changelog for 7.2.5.2 * correct version
…ra moves (Autodesk#1855) * fix the test of the camera type * update changelog * merge and fix changelog
cpichard
reviewed
Feb 15, 2024
| @@ -415,6 +415,36 @@ void _RemoveArnoldGlobalPrefix(const TfToken& key, TfToken& key_new) | |||
|
|
|||
| } // namespace | |||
|
|
|||
| #if ARNOLD_VERSION_NUM > 70203 | |||
There was a problem hiding this comment.
This was added in material_utils.h/cpp , I don't think we need it here
cpichard
reviewed
Feb 15, 2024
libs/render_delegate/volume.cpp
Outdated
| @@ -220,7 +219,7 @@ void HdArnoldVolume::Sync( | |||
| const auto materialId = sceneDelegate->GetMaterialId(id); | |||
| // Ensure the reference from this shape to its material is properly tracked | |||
| // by the render delegate | |||
| _renderDelegate->TrackDependencies(id, HdArnoldRenderDelegate::PathSetWithDirtyBits {{materialId, HdChangeTracker::DirtyMaterialId}}); | |||
| _renderDelegate->TrackDependencies(id, HdArnoldRenderDelegate::PathSetWithDirtyBits {{materialId, HdChangeTracker::DirtyMaterialId}}); | |||
There was a problem hiding this comment.
not important but there is an extra space, the indentation not the same
cpichard
reviewed
Feb 15, 2024
cpichard
approved these changes
Feb 15, 2024
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.
No description provided.