MAYA-109948 - Crash saving USD without opening Layer Editor

lib/usd/ui/layerEditor/CMakeLists.txt

@@ -37,6 +37,8 @@ target_sources(${PROJECT_NAME}
         mayaLayerEditorWindow.h
         mayaSessionState.cpp
         mayaSessionState.h
+        mayaQtUtils.cpp
+        mayaQtUtils.h
         pathChecker.cpp
         pathChecker.h
         qtUtils.cpp

lib/usd/ui/layerEditor/batchSaveLayersUIDelegate.cpp

@@ -16,13 +16,21 @@
 
 #include "batchSaveLayersUIDelegate.h"
 
+#include "mayaQtUtils.h"
 #include "saveLayersDialog.h"
 
 #include <mayaUsd/nodes/layerManager.h>
 #include <mayaUsd/utils/utilSerialization.h>
 
 #include <maya/MGlobal.h>
 
+void UsdLayerEditor::initialize()
+{
+    if (nullptr == UsdLayerEditor::utils) {
+        UsdLayerEditor::utils = new MayaQtUtils();
+    }
+}
+
 bool UsdLayerEditor::batchSaveLayersUIDelegate(const std::vector<UsdStageRefPtr>& stages)
 {
     if (MGlobal::kInteractive == MGlobal::mayaState()) {

lib/usd/ui/layerEditor/batchSaveLayersUIDelegate.h

@@ -28,6 +28,9 @@ PXR_NAMESPACE_USING_DIRECTIVE
 
 namespace UsdLayerEditor {
 
+MAYAUSD_UI_PUBLIC
+void initialize();
+
 MAYAUSD_UI_PUBLIC
 bool batchSaveLayersUIDelegate(const std::vector<UsdStageRefPtr>&);
 

lib/usd/ui/layerEditor/mayaLayerEditorWindow.cpp

@@ -21,8 +21,8 @@
 #include "layerEditorWidget.h"
 #include "layerTreeModel.h"
 #include "layerTreeView.h"
+#include "mayaQtUtils.h"
 #include "mayaSessionState.h"
-#include "qtUtils.h"
 #include "sessionState.h"
 
 #include <mayaUsd/utils/query.h>
@@ -86,33 +86,6 @@ AbstractLayerEditorCreator::PanelNamesList LayerEditorWindowCreator::getAllPanel
     return result;
 }
 
-class MayaQtUtils : public QtUtils
-{
-
-    double dpiScale() override { return MQtUtil::dpiScale(1.0f); }
-    QIcon  createIcon(const char* iconName) override
-    {
-        QIcon* icon = MQtUtil::createIcon(iconName);
-        QIcon  copy;
-        if (icon) {
-            copy = QIcon(*icon);
-        }
-        delete icon;
-        return copy;
-    }
-
-    QPixmap createPixmap(QString const& pixmapName, int width, int height) override
-    {
-        QPixmap* pixmap = MQtUtil::createPixmap(pixmapName.toStdString().c_str());
-        if (pixmap != nullptr) {
-            QPixmap copy(*pixmap);
-            delete pixmap;
-            return copy;
-        }
-        return QPixmap();
-    }
-} g_mayaQtUtils;
-
 } // namespace
 
 namespace UsdLayerEditor {
@@ -122,10 +95,11 @@ MayaLayerEditorWindow::MayaLayerEditorWindow(const char* panelName, QWidget* par
     , AbstractLayerEditorWindow(panelName)
     , _panelName(panelName)
 {
+    // Normally this will be set from the MayaUsd plugin, but only
+    // when building with UFE (for the batch save case).
     if (!UsdLayerEditor::utils) {
-        UsdLayerEditor::utils = &g_mayaQtUtils;
+        UsdLayerEditor::utils = new MayaQtUtils();
     }
-
     onCreateUI();
 
     connect(

lib/usd/ui/layerEditor/mayaQtUtils.cpp

@@ -0,0 +1,47 @@
+//
+// Copyright 2020 Autodesk
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#include "mayaQtUtils.h"
+
+#include <maya/MQtUtil.h>
+
+namespace UsdLayerEditor {
+
+double MayaQtUtils::dpiScale() { return MQtUtil::dpiScale(1.0f); }
+
+QIcon MayaQtUtils::createIcon(const char* iconName)
+{
+    QIcon* icon = MQtUtil::createIcon(iconName);
+    QIcon  copy;
+    if (icon) {
+        copy = QIcon(*icon);
+    }
+    delete icon;
+    return copy;
+}
+
+QPixmap MayaQtUtils::createPixmap(QString const& pixmapName, int width, int height)
+{
+    QPixmap* pixmap = MQtUtil::createPixmap(pixmapName.toStdString().c_str());
+    if (pixmap != nullptr) {
+        QPixmap copy(*pixmap);
+        delete pixmap;
+        return copy;
+    }
+    return QPixmap();
+}
+
+} // namespace UsdLayerEditor

lib/usd/ui/layerEditor/mayaQtUtils.h

@@ -0,0 +1,34 @@
+//
+// Copyright 2020 Autodesk
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#ifndef MAYAQTUTILS_H
+#define MAYAQTUTILS_H
+
+#include "qtUtils.h"
+
+namespace UsdLayerEditor {
+
+class MayaQtUtils : public QtUtils
+{
+public:
+    double  dpiScale() override;
+    QIcon   createIcon(const char* iconName) override;
+    QPixmap createPixmap(QString const& pixmapName, int width, int height) override;
+};
+
+} // namespace UsdLayerEditor
+
+#endif // MAYAQTUTILS_H

plugin/adsk/plugin/plugin.cpp

@@ -323,6 +323,7 @@ MStatus initializePlugin(MObject obj)
 #if defined(WANT_UFE_BUILD)
     MayaUsd::LayerManager::addSupportForNodeType(MAYAUSD_NS::ProxyShape::typeId);
 #if defined(WANT_QT_BUILD)
+    UsdLayerEditor::initialize();
     MayaUsd::LayerManager::SetBatchSaveDelegate(UsdLayerEditor::batchSaveLayersUIDelegate);
 #endif
 #endif