EMSUSD-121 - Use display color when texture mode is disabled #3272
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
vlasovi
reviewed
Aug 14, 2023
| if (!_GetMaterialPrimvars(renderIndex, materialId, requiredPrimvars)) { | ||
| // Only load textures when texture mode is selected | ||
| if (!_GetMaterialPrimvars(renderIndex, materialId, requiredPrimvars) | ||
| || !(reprToken == HdReprTokens->smoothHull)) { |
There was a problem hiding this comment.
This looks wrong. If your intention here is to choose sFallbackShaderPrimvars for untextured mode then you need to have something like: || (reprToken == HdReprTokens->smoothHullUntextured)
There was a problem hiding this comment.
Also, in case where hasColor is true below, we don't use fallback shader. So I guess this logic should be consistent
vlasovi
reviewed
Aug 14, 2023
| || parameters.indexOf("diffuseColor") != -1 | ||
| || parameters.indexOf("color") != -1; | ||
| // if not, use the fallback shader, which will use the display color | ||
| if (!hasColor) |
There was a problem hiding this comment.
What are we supposed to do if hasColor is true? Now we do nothing, but probably we should proceed into the normal material case.
vlasovi
reviewed
Aug 21, 2023
| @@ -21,6 +21,7 @@ | |||
| #include "meshViewportCompute.h" | |||
| #include "primvarInfo.h" | |||
|
|
|||
| #include <mayaUsd/base/tokens.h> | |||
There was a problem hiding this comment.
I think this include can be in cpp file
vlasovi
requested changes
Aug 21, 2023
JGamache-autodesk
approved these changes
Aug 21, 2023
vlasovi
approved these changes
Aug 22, 2023
samuelliu-adsk
added
the
ready-for-merge
seando-adsk
deleted the
samuelliu-adsk/EMSUSD-121/display_color_for_untextured
branch
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.
ogs -reset. This command will be added to the user pref call as well, so the user can see the difference when toggle the optionVar