Improve connecting to surface experience #2534
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
- If we can not find a shader source type, assume the user knows what he is doing. - If trying to connect a node graph output to surface, dig into the node graph in case we find a shader source type by traversing the connections.
| PXR_NS::SdrShaderNodeConstPtr | ||
| _GetShaderNodeDef(const PXR_NS::UsdPrim& prim, const PXR_NS::TfToken& attrName) | ||
| { | ||
| UsdPrim targetPrim = prim; |
There was a problem hiding this comment.
Traverse into layers of NodeGraphs until a shader is found. Similar to what we do when traversing node graphs in the material importer.
| TfToken renderContext = srcShaderNodeDef->GetSourceType() == "glslfx" | ||
| = _GetShaderNodeDef(srcUsdAttr->usdPrim(), srcBaseName); | ||
| TfToken renderContext | ||
| = !srcShaderNodeDef || srcShaderNodeDef->GetSourceType() == "glslfx" |
There was a problem hiding this comment.
If we do not find a shader node def, assume the user knows what he is doing and that connecting on the regular surface port is what he wants.
ppt-adsk
approved these changes
Aug 8, 2022
JGamache-autodesk
added
the
ready-for-merge
boudrey
approved these changes
Aug 15, 2022
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.
is doing.
graph in case we find a shader source type by traversing the
connections.