From 0e0b7d8cc7d922e26550c7041eabd9b78c3f3102 Mon Sep 17 00:00:00 2001 From: Yves Boudreault Date: Wed, 13 Apr 2022 09:51:37 -0400 Subject: [PATCH 1/2] MAYA-121532 push/pull: usdeditAsMaya set should be a locked node --- lib/mayaUsd/fileio/primUpdaterManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mayaUsd/fileio/primUpdaterManager.cpp b/lib/mayaUsd/fileio/primUpdaterManager.cpp index 6ee688a126..85ee135ed1 100644 --- a/lib/mayaUsd/fileio/primUpdaterManager.cpp +++ b/lib/mayaUsd/fileio/primUpdaterManager.cpp @@ -365,8 +365,8 @@ PullImportPaths pullImport( MStatus status = UsdMayaUtil::GetMObjectByName(kPullSetName, pullSetObj); if (status != MStatus::kSuccess) { MString createSetCmd; - createSetCmd.format("sets -em -name \"^1s\";", kPullSetName.asChar()); - MDGModifier& dgMod = MDGModifierUndoItem::create("Pull import pull set creation"); + createSetCmd.format("sets -em -name \"^1s\";lockNode \"^1s\";", kPullSetName.asChar()); + MDGModifier& dgMod = MDGModifierUndoItem::create("Pull import pull set creation and lock"); dgMod.commandToExecute(createSetCmd); dgMod.doIt(); } From fb799a609d5895159a8c191119cd2c566287cfaf Mon Sep 17 00:00:00 2001 From: Yves Boudreault Date: Wed, 13 Apr 2022 13:36:07 -0400 Subject: [PATCH 2/2] clang format fix --- lib/mayaUsd/fileio/primUpdaterManager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/mayaUsd/fileio/primUpdaterManager.cpp b/lib/mayaUsd/fileio/primUpdaterManager.cpp index 85ee135ed1..d94f0ed453 100644 --- a/lib/mayaUsd/fileio/primUpdaterManager.cpp +++ b/lib/mayaUsd/fileio/primUpdaterManager.cpp @@ -366,7 +366,8 @@ PullImportPaths pullImport( if (status != MStatus::kSuccess) { MString createSetCmd; createSetCmd.format("sets -em -name \"^1s\";lockNode \"^1s\";", kPullSetName.asChar()); - MDGModifier& dgMod = MDGModifierUndoItem::create("Pull import pull set creation and lock"); + MDGModifier& dgMod + = MDGModifierUndoItem::create("Pull import pull set creation and lock"); dgMod.commandToExecute(createSetCmd); dgMod.doIt(); }