USD: Fix duplicate shader nodes on import #118002

Merged

3 Commits

Author SHA1 Message Date
Michael Kowalski 156068085f USD: fixed previous merge conflicts 2024-02-08 11:40:13 -05:00
Michael Kowalski b8496e96b8 Merge branch 'blender-v4.1-release' into usd-fix-duplicate-imported-shaders
Note: This commit won't compile due to merge conflicts.
2024-02-08 11:33:26 -05:00
Michael Kowalski b617cfda1a USD: Fix duplicate shader nodes on import
buildbot/vexp-code-patch-lint Build done. Details
buildbot/vexp-code-patch-linux-x86_64 Build done. Details
buildbot/vexp-code-patch-windows-amd64 Build done. Details
buildbot/vexp-code-patch-coordinator Build done. Details
Fixed duplicate nodes when converting texture scale/bias and
channel names on material import.  This required extending
the node caching to handle cases where a USD shader is converted
to multiple Blender nodes.
2024-02-08 10:44:05 -05:00