Outliner rework of Material items: #2775
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
Right-click menu on prim when material is assigned. - Unbind Material should say Unassign Material Right-click menu on any scope that matches the default scope name - Bind Material menu should be removed - Assign New Material should be changed to Add New Material Right-click menu on material node when nothing else is selected - Assign Material to Selection should be hidden, not just disabled, if there's no selection - Bind Material menu should be removed - Assign New Material: should you be able to assign a material to a material? This should be removed Right-click menu on material node when there is a selection - Assign New Material: should be removed Letter-casing in Assign New Material sub-menus is incorrect - USD instead of Usd - glTF PBR instead of Gltf Pbr Added unit test for the new "Add New Material" command.
pierrebai-adsk
requested changes
Dec 13, 2022
| @@ -752,6 +752,21 @@ bool selectionSupportsShading() | |||
| return false; | |||
| } | |||
|
|
|||
| #ifdef UFE_V3_FEATURES_AVAILABLE | |||
There was a problem hiding this comment.
I think this function is unused and came back during the conflict resolution.
There was a problem hiding this comment.
I see it used at line 1211. The Linux and OS/X builds do not allow an unused function to exist. I agree it should not have suddenly appeared from conflict resolution since it was added a month ago in PR #2762 and should have been in the branch I started with. This is strange.
There was a problem hiding this comment.
Not strange finally. The code was added last month in a branch that was merged yesterday. This is why it appeared in as a conflict to resolve in my branch.
pierrebai-adsk
approved these changes
Dec 14, 2022
JGamache-autodesk
added
the
ready-for-merge
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.
Right-click menu on prim when material is assigned.
Right-click menu on any scope that matches the default scope name
Right-click menu on material node when nothing else is selected
Right-click menu on material node when there is a selection
Letter-casing in Assign New Material sub-menus is incorrect
Added unit test for the new "Add New Material" command.