Merge pull request #758 from marsupial/PR/mtoh-render-settings

[mtoh] Refactor settings / defaultRenderGlobals storage
Autodesk · Oct 2, 2020 · 36e3113 · 36e3113
2 parents 299cda1 + 72def6d
commit 36e3113
Show file tree

Hide file tree

Showing 7 changed files with 969 additions and 443 deletions.
diff --git a/lib/mayaUsd/render/mayaToHydra/plugin.cpp b/lib/mayaUsd/render/mayaToHydra/plugin.cpp
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 
 #include <maya/MFnPlugin.h>
+#include <maya/MGlobal.h>
 
 #include <pxr/base/plug/plugin.h>
 #include <pxr/base/plug/registry.h>
@@ -83,6 +84,9 @@ PLUGIN_EXPORT MStatus uninitializePlugin(MObject obj) {
         }
     }
 
+    // Clear any registered callbacks
+    MGlobal::executeCommand("callbacks -cc mtoh;");
+
     if (!plugin.deregisterCommand(MtohViewCmd::name)) {
         ret = MS::kFailure;
         ret.perror("Error deregistering mtoh command!");