Merge remote-tracking branch 'upstream/dev' into deboisj/unify_layer_editor_review

# Conflicts:
#	lib/usd/ui/CMakeLists.txt
#	lib/usd/ui/layerEditor/mayaCommandHook.cpp
#	lib/usd/ui/renderSetup/renderSetupWindowCmd.cpp
KBuYmLgYNrFpAfTMkewbc
 CKMXQPPtE40icSdsp8GsAmou8z/TdcXkVrx3JD5N4CxgT81ekwYQX5TvwCxQymhd
 fMGynH4JkKWCg5FK//rsu623du4u9XiTzOQrdsIGT7AMGotqm1qubXInvR+HKARo
 gxtSQ6mQf+CSGznSNbJlvy8aXq1tfH8fJv28nOXmMXSaq6cXq79lcF6tmS/VMylx
 pAi5CcIDsXH9rlbsyaKQjtgR30DyaFcu8xoIrQZ19oLk0AmvwGXMhjBVLxs7nKPY
 jxwJCaPIsEJKxebk5kGRocwFCDs5C+a3eT4I4NW5cOZRd4jzh9KuZ38VuO5BY/GN
 e7WSA+dxP67xP05w6EYjjdt1qrfe9Ko9jlTb506ptYTBm7Ewz+6roCz40QW7wo1X
 2ddj3B6oU3p0vIQVxTT8WhIXhrB/cccMMqaTEBt6YuiczLFCHuYzAOj1znAqnzrL
 XZWw2OaS9OkyBE0DnOd4czNnzSyx/vSBPo5Xo/QPi0fiVdOdNI/bdTC2NW+E6QTJ
 rMUPY1vf/KZPRV8l306V
 =2bZ3
 -----END PGP SIGNATURE-----
 

Merge pull request #4655 from Autodesk/bailp/EMSUSD-3823/layer-display-refresh

EMSUSD-3823 fix layer content refresh`ImportChaser` pluginsis no…both unchanged.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
8 <noreply@anthropic.com>
<noreply@anthropic.com>
opic.com>

Author: deboisj

lib/mayaUsd/commands/Readme.md

@@ -87,18 +87,27 @@ pipeline-specific operations and/or early prototyping of features that might
 otherwise not make sense to be part of the mainline codebase.
 
 Chasers are registered with a particular name and can be passed argument
-name/value pairs in an invocation of `mayaUSDImport`. There is no "plugin
-discovery" method here – the developer/user is responsible for making sure the
-chaser is registered via a call to the convenience macro
-`USDMAYA_DEFINE_IMPORT_CHASER_FACTORY(name, ctx)`, where `name` is the name of
-the chaser being created. Unlike export chasers, import chasers also have the
-ability to define `Undo` and `Redo` methods in order to allow the
+name/value pairs in an invocation of `mayaUSDImport`. The chaser is registered
+via a call to the convenience macro `USDMAYA_DEFINE_IMPORT_CHASER_FACTORY(name,
+ctx)`, where `name` is the name of the chaser being created. Import chaser
+plugins can be discovered and loaded automatically by declaring the
+`UsdMaya:ImportChaserPlugin` metadata in their `plugInfo.json`:
+
+```json
+"Info": {
+  "UsdMaya": {
+    "ImportChaserPlugin": {}
+  }
+}
+```
+
+Unlike export chasers, import chasers also have the ability to define `Undo` and
+`Redo` methods in order to allow the
 `mayaUSDImport` command to remain compliant with the Maya undo stack. It's not
 necessary to compile your chaser plugin together with `mayaUsdPlugin` in order
 to work; you can create a completely separate maya DLL that contains the
 business logic of your chaser code, and just call the aforementioned
-`USDMAYA_DEFINE_IMPORT_CHASER_FACTORY` to register it, as long as the
-`mayaUsdPlugin` DLL is loaded first.
+`USDMAYA_DEFINE_IMPORT_CHASER_FACTORY` to register it.
 
 A sample import chaser, `infoImportChaser.cpp`, is provided to give an example
 of how to write an import chaser. All it does is read any custom layer data in
@@ -399,9 +408,17 @@ implement prim post-processing that executes immediately after prims
 are written (and/or after animation is written to a prim in time-based
 exports). Chasers are registered with a particular name and can be
 passed argument name/value pairs in an invocation of a concrete
-`MayaUSDExportCommand` command. There is no "plugin discovery" method
-here – the developer/user is responsible for making sure the chaser is
-registered.
+`MayaUSDExportCommand` command. Export chaser plugins can be discovered
+and loaded automatically by declaring the `UsdMaya:ExportChaserPlugin`
+metadata in their `plugInfo.json`:
+
+```json
+"Info": {
+  "UsdMaya": {
+    "ExportChaserPlugin": {}
+  }
+}
+```
 
 For example the pxr plug-in provides one such chaser plugin called
 `AlembicChaser` to try to make integrating USD into Alembic-heavy

lib/mayaUsd/fileio/chaser/exportChaserRegistry.cpp

@@ -67,7 +67,9 @@ bool UsdMayaExportChaserRegistry::RegisterFactory(
 UsdMayaExportChaserRefPtr
 UsdMayaExportChaserRegistry::Create(const std::string& name, const FactoryContext& context) const
 {
+    UsdMaya_RegistryHelper::LoadExportChaserPlugins();
     TfRegistryManager::GetInstance().SubscribeTo<UsdMayaExportChaserRegistry>();
+
     if (UsdMayaExportChaserRegistry::FactoryFn fn = _factoryRegistry[name]) {
         return TfCreateRefPtr(fn(context));
     } else {

lib/mayaUsd/fileio/chaser/importChaserRegistry.cpp

@@ -80,7 +80,9 @@ bool UsdMayaImportChaserRegistry::RegisterFactory(const char* name, FactoryFn fn
 UsdMayaImportChaserRefPtr
 UsdMayaImportChaserRegistry::Create(const char* name, const FactoryContext& context) const
 {
+    UsdMaya_RegistryHelper::LoadImportChaserPlugins();
     TfRegistryManager::GetInstance().SubscribeTo<UsdMayaImportChaserRegistry>();
+
     if (UsdMayaImportChaserRegistry::FactoryFn fn = _factoryImportRegistry[name]) {
         return TfCreateRefPtr(fn(context));
     } else {

lib/mayaUsd/fileio/registryHelper.cpp

@@ -42,6 +42,8 @@ TF_DEFINE_PRIVATE_TOKENS(
     (UsdMaya)
     (ShadingModePlugin)
     (JobContextPlugin)
+    (ImportChaserPlugin)
+    (ExportChaserPlugin)
 );
 // clang-format on
 
@@ -140,6 +142,42 @@ static bool _HasMayaPlugin(
     return true;
 }
 
+static void _FindAndLoadUsdMayaPlugins(const TfToken& pluginKey)
+{
+    const std::vector<TfToken> scope { _tokens->UsdMaya, pluginKey };
+
+    for (const auto& plug : PlugRegistry::GetInstance().GetAllPlugins()) {
+        std::string mayaPlugin;
+        if (_HasMayaPlugin(plug, scope, &mayaPlugin)) {
+            if (!mayaPlugin.empty()) {
+                TF_DEBUG(PXRUSDMAYA_REGISTRY)
+                    .Msg(
+                        "Found %s %s: Loading via Maya API %s.\n",
+                        pluginKey.GetText(),
+                        plug->GetName().c_str(),
+                        mayaPlugin.c_str());
+                std::string loadPluginCmd
+                    = TfStringPrintf("loadPlugin -quiet %s", mayaPlugin.c_str());
+                if (MGlobal::executeCommand(loadPluginCmd.c_str())) {
+                    // Need to ensure Python script modules are loaded
+                    // properly for this library (Maya's loadPlugin will not
+                    // load script modules like TfDlopen would).
+                    TfScriptModuleLoader::GetInstance().LoadModules();
+                } else {
+                    TF_CODING_ERROR("Unable to load mayaplugin %s\n", mayaPlugin.c_str());
+                }
+            } else {
+                TF_DEBUG(PXRUSDMAYA_REGISTRY)
+                    .Msg(
+                        "Found %s %s: Loading via USD API.\n",
+                        pluginKey.GetText(),
+                        plug->GetName().c_str());
+                plug->Load();
+            }
+        }
+    }
+}
+
 /* static */
 std::string _PluginDictScopeToDebugString(const std::vector<TfToken>& scope)
 {
@@ -202,81 +240,29 @@ void UsdMaya_RegistryHelper::FindAndLoadMayaPlug(
 /* static */
 void UsdMaya_RegistryHelper::LoadShadingModePlugins()
 {
-    static std::once_flag       _shadingModesLoaded;
-    static std::vector<TfToken> scope = { _tokens->UsdMaya, _tokens->ShadingModePlugin };
-    std::call_once(_shadingModesLoaded, []() {
-        PlugPluginPtrVector plugins = PlugRegistry::GetInstance().GetAllPlugins();
-        std::string         mayaPlugin;
-        TF_FOR_ALL(plugIter, plugins)
-        {
-            PlugPluginPtr plug = *plugIter;
-            if (_HasMayaPlugin(plug, scope, &mayaPlugin)) {
-                if (!mayaPlugin.empty()) {
-                    TF_DEBUG(PXRUSDMAYA_REGISTRY)
-                        .Msg(
-                            "Found shading mode plugin %s: Loading via Maya API %s.\n",
-                            plug->GetName().c_str(),
-                            mayaPlugin.c_str());
-                    std::string loadPluginCmd
-                        = TfStringPrintf("loadPlugin -quiet %s", mayaPlugin.c_str());
-                    if (MGlobal::executeCommand(loadPluginCmd.c_str())) {
-                        // Need to ensure Python script modules are loaded
-                        // properly for this library (Maya's loadPlugin will not
-                        // load script modules like TfDlopen would).
-                        TfScriptModuleLoader::GetInstance().LoadModules();
-                    } else {
-                        TF_CODING_ERROR("Unable to load mayaplugin %s\n", mayaPlugin.c_str());
-                    }
-                } else {
-                    TF_DEBUG(PXRUSDMAYA_REGISTRY)
-                        .Msg(
-                            "Found shading mode plugin %s: Loading via USD API.\n",
-                            plug->GetName().c_str());
-                    plug->Load();
-                }
-            }
-        }
-    });
+    static std::once_flag _loaded;
+    std::call_once(_loaded, []() { _FindAndLoadUsdMayaPlugins(_tokens->ShadingModePlugin); });
 }
 
 /* static */
 void UsdMaya_RegistryHelper::LoadJobContextPlugins()
 {
-    static std::once_flag       _jobContextsLoaded;
-    static std::vector<TfToken> scope = { _tokens->UsdMaya, _tokens->JobContextPlugin };
-    std::call_once(_jobContextsLoaded, []() {
-        PlugPluginPtrVector plugins = PlugRegistry::GetInstance().GetAllPlugins();
-        std::string         mayaPlugin;
-        TF_FOR_ALL(plugIter, plugins)
-        {
-            PlugPluginPtr plug = *plugIter;
-            if (_HasMayaPlugin(plug, scope, &mayaPlugin)) {
-                if (!mayaPlugin.empty()) {
-                    TF_DEBUG(PXRUSDMAYA_REGISTRY)
-                        .Msg(
-                            "Found job context plugin %s: Loading via Maya API %s.\n",
-                            plug->GetName().c_str(),
-                            mayaPlugin.c_str());
-                    std::string loadPluginCmd
-                        = TfStringPrintf("loadPlugin -quiet %s", mayaPlugin.c_str());
-                    if (MGlobal::executeCommand(loadPluginCmd.c_str())) {
-                        // Need to ensure Python script modules are loaded
-                        // properly for this library (Maya's loadPlugin will not
-                        // load script modules like TfDlopen would).
-                        TfScriptModuleLoader::GetInstance().LoadModules();
-                    } else {
-                        TF_CODING_ERROR("Unable to load mayaplugin %s\n", mayaPlugin.c_str());
-                    }
-                } else {
-                    TF_DEBUG(PXRUSDMAYA_REGISTRY)
-                        .Msg(
-                            "Found job context plugin %s: Loading via USD API.\n",
-                            plug->GetName().c_str());
-                    plug->Load();
-                }
-            }
-        }
-    });
+    static std::once_flag _loaded;
+    std::call_once(_loaded, []() { _FindAndLoadUsdMayaPlugins(_tokens->JobContextPlugin); });
+}
+
+/* static */
+void UsdMaya_RegistryHelper::LoadImportChaserPlugins()
+{
+    static std::once_flag _loaded;
+    std::call_once(_loaded, []() { _FindAndLoadUsdMayaPlugins(_tokens->ImportChaserPlugin); });
+}
+
+/* static */
+void UsdMaya_RegistryHelper::LoadExportChaserPlugins()
+{
+    static std::once_flag _loaded;
+    std::call_once(_loaded, []() { _FindAndLoadUsdMayaPlugins(_tokens->ExportChaserPlugin); });
 }
 
 /* static */

lib/mayaUsd/fileio/registryHelper.h

@@ -74,6 +74,30 @@ struct UsdMaya_RegistryHelper
     /// usdMaya will try to load the "mayaPlugin" when job contexts are first accessed.
     static void LoadJobContextPlugins();
 
+    /// Searches the plugInfos and looks for ImportChaserPlugin.
+    ///
+    /// "UsdMaya" : {
+    ///     "ImportChaserPlugin" : {
+    ///         "mayaPlugin" : "myImportChaserPlugin"
+    ///     }
+    /// }
+    ///
+    /// At that scope, it expects an optional "mayaPlugin" key.
+    /// usdMaya will try to load the plugin when import chasers are first accessed.
+    static void LoadImportChaserPlugins();
+
+    /// Searches the plugInfos and looks for ExportChaserPlugin.
+    ///
+    /// "UsdMaya" : {
+    ///     "ExportChaserPlugin" : {
+    ///         "mayaPlugin" : "myExportChaserPlugin"
+    ///     }
+    /// }
+    ///
+    /// At that scope, it expects an optional "mayaPlugin" key.
+    /// usdMaya will try to load the plugin when export chasers are first accessed.
+    static void LoadExportChaserPlugins();
+
     /// Searches the plugInfos for metadata dictionaries at the given \p scope,
     /// and composes them together.
     /// The scope are the nested keys to search through in the plugInfo (for

lib/usd/ui/CMakeLists.txt

@@ -122,6 +122,7 @@ endif()
 # -----------------------------------------------------------------------------
 set(HEADERS
     api.h
+    undoChunkUtils.h
 )
 
 mayaUsd_promoteHeaderList( 

lib/usd/ui/debugTools/CompositionEditorCmd.cpp

@@ -17,6 +17,7 @@
 
 #include <mayaUsd/ufe/Utils.h>
 #include <mayaUsd/undo/MayaUsdUndoBlock.h>
+#include <mayaUsdUI/ui/undoChunkUtils.h>
 
 #include <usdUfe/undo/UsdUndoManager.h>
 
@@ -62,31 +63,6 @@ constexpr auto kReloadFlagLong = "-reload";
 
 const MString WORKSPACE_CONTROL_NAME = "mayaUsdCompositionEditor";
 
-// RAII guard that opens a named Maya undo chunk
-class UndoChunkContext
-{
-private:
-    // Maya's undo chunk names cannot contain spaces (the name is split at the
-    // first space), so replace them with underscores before quoting.
-    MString cleanChunkName(const std::string& label)
-    {
-        std::string name = label.empty() ? "USD Composition Edit" : label;
-        std::replace(name.begin(), name.end(), ' ', '_');
-        return MString("\"") + name.c_str() + "\"";
-    }
-
-public:
-    explicit UndoChunkContext(const std::string& label)
-    {
-        MGlobal::executeCommand(
-            MString("undoInfo -openChunk -chunkName ") + cleanChunkName(label), false, false);
-    }
-    ~UndoChunkContext() { MGlobal::executeCommand("undoInfo -closeChunk", false, false); }
-
-    UndoChunkContext(const UndoChunkContext&) = delete;
-    UndoChunkContext& operator=(const UndoChunkContext&) = delete;
-};
-
 QPointer<Adsk::UsdDebug::CompositionEditorWidget> g_compositionEditorWidget;
 Ufe::Observer::Ptr                                g_selectionObserver;
 
@@ -167,8 +143,8 @@ class MayaCompositionEditorHost : public Adsk::UsdDebug::ApplicationHost
             UsdUfe::UsdUndoManager::instance().trackLayerStates(layer);
         }
 
-        UndoChunkContext undoChunk(editLabel);
-        MayaUsdUndoBlock undoBlock;
+        MayaUsdUI::UndoChunkGuard undoChunk(editLabel);
+        MayaUsdUndoBlock          undoBlock;
         return edit();
     }
 

lib/usd/ui/layerEditor/layerEditorWidget.cpp

@@ -145,6 +145,13 @@ QLayout* LayerEditorWidget::setupLayout_toolbar()
         this,
         &LayerEditorWidget::onLazyUpdateLayerContents);
 
+    // update layer contents widget on selected layer data change
+    connect(
+        _treeView->layerTreeModel(),
+        &LayerTreeModel::selectedLayerDataChangedSignal,
+        this,
+        &LayerEditorWidget::onLazyUpdateLayerContents);
+
     _buttons._loadLayer = addHIGButton(
         ":/UsdLayerEditor/import_layer",
         StringResources::getAsQString(StringResources::kLoadExistingLayer),

lib/usd/ui/layerEditor/layerTreeModel.cpp

@@ -294,11 +294,12 @@ void LayerTreeModel::setSessionState(SessionState* in_sessionState)
         this,
         &LayerTreeModel::autoHideSessionLayerChanged);
 
-    rebuildModelOnIdle();
+    rebuildModelOnIdle(true);
 }
 
-void LayerTreeModel::rebuildModelOnIdle()
+void LayerTreeModel::rebuildModelOnIdle(bool dataChanged)
 {
+    _selectedLayerDataChanged |= dataChanged;
     if (!_rebuildOnIdlePending) {
         _rebuildOnIdlePending = true;
         QTimer::singleShot(0, this, [this]() {
@@ -313,6 +314,11 @@ void LayerTreeModel::rebuildModel(bool refreshLockState /*= false*/)
     _rebuildOnIdlePending = false;
     _lastAskedAnonLayerNameSinceRebuild = 0;
 
+    if (_selectedLayerDataChanged) {
+        Q_EMIT selectedLayerDataChangedSignal();
+        _selectedLayerDataChanged = false;
+    }
+
     if (!_sessionState->isValid()) {
         if (rowCount() > 0) {
             // Note: clear() calls beginResetModel and endResetModel for us.
@@ -472,7 +478,7 @@ void LayerTreeModel::usd_layerChanged(SdfNotice::LayersDidChangeSentPerLayer con
 {
     // experienced crashes in python prototype  For now, rebuild everything
     if (!_blockUsdNotices)
-        rebuildModelOnIdle();
+        rebuildModelOnIdle(true);
 }
 
 // notification from USD

lib/usd/ui/layerEditor/layerTreeModel.h

@@ -124,6 +124,7 @@ class LayerTreeModel
 
 Q_SIGNALS:
     void selectLayerSignal(const QModelIndex&);
+    void selectedLayerDataChangedSignal();
 
 protected:
     // slots
@@ -149,8 +150,9 @@ class LayerTreeModel
 
     mutable int _lastAskedAnonLayerNameSinceRebuild = 0;
 
-    void rebuildModelOnIdle();
+    void rebuildModelOnIdle(bool dataChanged = false);
     bool _rebuildOnIdlePending = false;
+    bool _selectedLayerDataChanged = false;
     void rebuildModel(bool refreshLockState = false);
 
     void updateTargetLayer(InRebuildModel inRebuild);