Merge pull request #3915 from Autodesk/bailp/EMSUSD-1619/remove-anon-…

…layers EMSUSD-1619 fix removal on multiple layers
Autodesk · Sep 18, 2024 · 9d770c0 · 9d770c0
2 parents 5d5c425 + 50b5b85
commit 9d770c0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/lib/usd/ui/layerEditor/layerTreeView.cpp b/lib/usd/ui/layerEditor/layerTreeView.cpp
@@ -445,6 +445,11 @@ void LayerTreeView::callMethodOnSelection(const QString& undoName, simpleLayerMe
 {
     DelayAbstractCommandHook delayed(*_model->sessionState()->commandHook());
 
+    callMethodOnSelectionNoDelay(undoName, method);
+}
+
+void LayerTreeView::callMethodOnSelectionNoDelay(const QString& undoName, simpleLayerMethod method)
+{
     CallMethodParams params;
     auto             selection = getSelectedLayerItems();
     params.selection = &selection;

diff --git a/lib/usd/ui/layerEditor/layerTreeView.h b/lib/usd/ui/layerEditor/layerTreeView.h
@@ -102,6 +102,7 @@ class LayerTreeView
     // calls a given method on all items in the selection, with the given string as the undo chunk
     // name
     void callMethodOnSelection(const QString& undoName, simpleLayerMethod method);
+    void callMethodOnSelectionNoDelay(const QString& undoName, simpleLayerMethod method);
 
     // menu callbacks
     void onAddParentLayer(const QString& undoName) const;

diff --git a/lib/usd/ui/layerEditor/mayaLayerEditorWindow.cpp b/lib/usd/ui/layerEditor/mayaLayerEditorWindow.cpp
@@ -173,7 +173,7 @@ std::string MayaLayerEditorWindow::proxyShapeName() const
 void MayaLayerEditorWindow::removeSubLayer()
 {
     QString name = "Remove";
-    treeView()->callMethodOnSelection(name, &LayerTreeItem::removeSubLayer);
+    treeView()->callMethodOnSelectionNoDelay(name, &LayerTreeItem::removeSubLayer);
 }
 
 void MayaLayerEditorWindow::saveEdits()