Merge remote-tracking branch 'github/dev' into azharia/EMSUSD-1692/Ad…

…d-LookdevXUsd-Extension
Autodesk · Dec 11, 2024 · 765afae · 765afae
2 parents 5d549fa + e56cdc5
commit 765afae
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/lib/mayaUsd/utils/diagnosticDelegate.cpp b/lib/mayaUsd/utils/diagnosticDelegate.cpp
@@ -143,6 +143,23 @@ class ErrorOnlyDelegate : public UsdUtilsCoalescingDiagnosticDelegate
     {
         UsdMayaDiagnosticDelegate::Flush();
 
+        // Note: TfLogCrash will do a hard abort of the process.
+        //       The dynamic libraries will be unloaded in a random order and
+        //       global variable will be destroyed. Unfortunately, USD holds a
+        //       mutex while in the TfLogCrash function and trying to remove the
+        //       diagnostic delegate (_waker) will also try to hold that mutex
+        //       resulting in a dead-lock. Avoid this by avoiding to destroy
+        //       the delegates
+        //
+        //       Yes, this means we are leaking the delegates, but we are in
+        //       the middle of crashing anyway, so it does not really matter.
+
+        _waker.release();
+        _flusher.release();
+        _batchedStatuses.release();
+        _batchedWarnings.release();
+        _batchedErrors.release();
+
         TfLogCrash(
             "FATAL ERROR",
             msg,

diff --git a/test/lib/ufe/testContextOps.py b/test/lib/ufe/testContextOps.py
@@ -1901,7 +1901,9 @@ def testGeomCoponentAssignment(self):
         dagPath.extendToShape()
 
         with mayaUsd.lib.OpUndoItemList():
-            mayaUsd.lib.PrimUpdaterManager.duplicate(cmds.ls(cubeXForm, long=True)[0], psPathStr)
+            mayaUsd.lib.PrimUpdaterManager.duplicate(
+                cmds.ls(cubeXForm, long=True)[0], psPathStr, 
+                {'exportComponentTags': True})
 
         topPath = ufe.PathString.path(psPathStr + ',/' + cubeXForm + "/" + "top")
         topItem = ufe.Hierarchy.createItem(topPath)

diff --git a/test/lib/usd/translators/UsdExportRfMLightTest/RfMLightsTest.ma b/test/lib/usd/translators/UsdExportRfMLightTest/RfMLightsTest.ma
@@ -1387,7 +1387,6 @@ createNode rmanGlobals -s -n "rmanGlobals";
 	setAttr ".ri_maxDiffuseDepth" 1;
 	setAttr ".ri_displayFilter" -type "string" "gaussian";
 	setAttr ".ri_displayFilterSize" -type "float2" 2 2 ;
-	setAttr ".pixelFilterMode" -type "string" "importance";
 	setAttr ".renderVariant" -type "string" "ris";
 	setAttr ".xpuMode" -type "long2" 1 1 ;
 	setAttr ".motionBlur" 0;
@@ -1565,7 +1564,6 @@ createNode rmanDisplayChannel -n "diffuse";
 	setAttr ".channelSource" -type "string" "lpe:C(D[DS]*[LO])|[LO]";
 	setAttr ".lpeLightGroup" -type "string" "";
 	setAttr ".filter" -type "string" "inherit from display";
-	setAttr ".filterwidth" -type "float2" -1 -1 ;
 	setAttr ".statistics" -type "string" "";
 	setAttr ".relativepixelvariance" -1;
 	setAttr ".shadowthreshold" 0.0099999997764825821;
@@ -1584,7 +1582,6 @@ createNode rmanDisplayChannel -n "a";
 	setAttr ".channelSource" -type "string" "a";
 	setAttr ".lpeLightGroup" -type "string" "";
 	setAttr ".filter" -type "string" "inherit from display";
-	setAttr ".filterwidth" -type "float2" -1 -1 ;
 	setAttr ".statistics" -type "string" "";
 	setAttr ".relativepixelvariance" -1;
 	setAttr ".shadowthreshold" 0.0099999997764825821;
@@ -2058,7 +2055,6 @@ createNode rmanDisplayChannel -n "Ci";
 	setAttr ".channelSource" -type "string" "Ci";
 	setAttr ".lpeLightGroup" -type "string" "";
 	setAttr ".filter" -type "string" "inherit from display";
-	setAttr ".filterwidth" -type "float2" -1 -1 ;
 	setAttr ".statistics" -type "string" "";
 	setAttr ".relativepixelvariance" 1;
 	setAttr ".shadowthreshold" 0.0099999997764825821;
@@ -2077,7 +2073,6 @@ createNode rmanDisplayChannel -n "a1";
 	setAttr ".channelSource" -type "string" "a";
 	setAttr ".lpeLightGroup" -type "string" "";
 	setAttr ".filter" -type "string" "inherit from display";
-	setAttr ".filterwidth" -type "float2" -1 -1 ;
 	setAttr ".statistics" -type "string" "";
 	setAttr ".relativepixelvariance" -1;
 	setAttr ".shadowthreshold" 0.0099999997764825821;