MAYA-128460 - undoing rename of prim causes prim's icon to change to def #2965
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
…ge to a def * For undo send the correct (new) prim in the Ufe notification. * Refactor undo/redo into common helper method.
seando-adsk
commented
Mar 23, 2023
seando-adsk
commented
Mar 23, 2023
Comment on lines
195
to
201
| void renameHelper( | ||
| PXR_NS::UsdStageWeakPtr stage, | ||
| const UsdSceneItem::Ptr& ufeSrcItem, | ||
| const Ufe::Path& srcPath, | ||
| UsdSceneItem::Ptr& ufeDstItem, | ||
| const Ufe::Path& dstPath, | ||
| const std::string& newName) |
There was a problem hiding this comment.
Added new helper method for both undo and redo to avoid code duplication.
| @@ -190,67 +192,63 @@ static void doUsdRename( | |||
| applyToAllPrimSpecs(prim, renameFunc); | |||
| } | |||
|
|
|||
| void UsdUndoRenameCommand::renameRedo() | |||
| void renameHelper( | |||
| PXR_NS::UsdStageWeakPtr stage, | |||
There was a problem hiding this comment.
While unlikely, a weak pointer could become invalid at any time. Also, it could be passed as const &. So i'd suggest using a const UsdStagePtr& here.
There was a problem hiding this comment.
Right good point.
| // stale. | ||
| const UsdPrim prim = _stage->GetPrimAtPath(_ufeDstItem->prim().GetPath()); | ||
| const std::string newName = _ufeSrcItem->prim().GetName(); | ||
| const Ufe::Path srcPath = _ufeSrcItem->path(); |
There was a problem hiding this comment.
I think scene item return teh path by ref, so this could be a &, to verify.
There was a problem hiding this comment.
Good point, changed to auto so we don't need to worry about return type.
| if (_ufeDstItem->prim().GetPath() == defaultPrimPath) { | ||
| _stage->SetDefaultPrim(_ufeSrcItem->prim()); | ||
| } | ||
| const Ufe::Path srcPath = _ufeDstItem->path(); |
There was a problem hiding this comment.
Same comment as above, could be const&
pierrebai-adsk
previously approved these changes
Mar 23, 2023
…ge to a def * Code review feedback
…ge to a def * clang-format fix (darn trailing space).
seando-adsk
added
the
ready-for-merge
seando-adsk
deleted the
donnels/MAYA-128460/undo_rename_of_prim_causing_def_icon
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.
MAYA-128460 - undoing the rename of a prim causes prim's icon to change to a def