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

Merge branch fix-7.2.5 20240125 #1831

Merged
merged 11 commits into from
Jan 25, 2024

Conversation

cpichard
Copy link
Collaborator

No description provided.

sebastienblor and others added 11 commits November 30, 2023 10:47
…render delegate (Autodesk#1777)

* add test for Autodesk#1776

* Initialize the rotation matrix with the quad directly

* update changelog for Autodesk#1776
… 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
…5_20240125

# Conflicts:
#	CHANGELOG.md
#	libs/render_delegate/basis_curves.cpp
#	libs/render_delegate/node_graph.cpp
#	libs/render_delegate/render_delegate.h
#	testsuite/groups
@cpichard cpichard marked this pull request as ready for review January 25, 2024 13:34
@cpichard cpichard merged commit 5454a9e into Autodesk:master Jan 25, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants