Merge pull request #2882 from Autodesk/azharia/MAYA-124103/export-all…

…-memory-leak-fix Releases the memory a data handle is holding onto when exporting meshes.
Autodesk · Mar 2, 2023 · 24c79ad · 24c79ad
2 parents d075edb + 0a5b709
commit 24c79ad
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/lib/mayaUsd/fileio/utils/meshWriteUtils.cpp b/lib/mayaUsd/fileio/utils/meshWriteUtils.cpp
@@ -1408,8 +1408,8 @@ MStatus UsdMayaMeshWriteUtils::exportComponentTags(UsdGeomMesh& primSchema, MObj
     MPlug outShp = depNodeFn.findPlug("outMesh", &status);
     CHECK_MSTATUS_AND_RETURN_IT(status);
 
-    MDataHandle geomDataHandle = outShp.asMDataHandle();
-    MObject     geomObj = geomDataHandle.data();
+    auto    outShpHolder = UsdMayaUtil::GetPlugDataHandle(outShp);
+    MObject geomObj = outShpHolder->GetDataHandle().data();
     if (geomObj.hasFn(MFn::kGeometryData)) {
         TfToken         componentTagFamilyName("componentTag");
         MFnGeometryData fnGeomData(geomObj);

diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.cpp b/lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.cpp
@@ -24,6 +24,8 @@
 #include <pxr/usdImaging/usdImaging/delegate.h>
 
 #ifdef MAYA_HAS_DISPLAY_LAYER_API
+#include <mayaUsd/utils/util.h>
+
 #include <maya/MFnDisplayLayer.h>
 #include <maya/MFnDisplayLayerManager.h>
 #include <maya/MObjectArray.h>
@@ -702,7 +704,8 @@ void MayaUsdRPrim::_ProcessDisplayLayerModes(
     }
 
     if (useRGBColors.asBool()) {
-        const float3& rgbColor = colorRGB.asMDataHandle().asFloat3();
+        auto          colorRGBHolder = UsdMayaUtil::GetPlugDataHandle(colorRGB);
+        const float3& rgbColor = colorRGBHolder->GetDataHandle().asFloat3();
         displayLayerModes._wireframeColorIndex = -1;
         displayLayerModes._wireframeColorRGBA
             = MColor(rgbColor[0], rgbColor[1], rgbColor[2], colorA.asFloat());

diff --git a/lib/usd/translators/meshWriter.cpp b/lib/usd/translators/meshWriter.cpp
@@ -567,9 +567,11 @@ bool PxrUsdTranslators_MeshWriter::writeMeshAttrs(
             MPlug plgBlendShapeInput = plgBlendShapeInputs.elementByLogicalIndex(idxGeo);
             MPlug plgBlendShapeInputGeometry
                 = UsdMayaUtil::FindChildPlugWithName(plgBlendShapeInput, "inputGeometry");
+            auto plgBlendShapeInputGeometryHolder
+                = UsdMayaUtil::GetPlugDataHandle(plgBlendShapeInputGeometry);
             MDataHandle dhInputGeo
-                = plgBlendShapeInputGeometry
-                      .asMDataHandle(); // NOTE: (yliangsiew) This should be the pref mesh.
+                = plgBlendShapeInputGeometryHolder->GetDataHandle(); // NOTE: (yliangsiew) This
+                                                                     // should be the pref mesh.
             TF_VERIFY(dhInputGeo.type() == MFnData::kMesh);
             MObject inputGeo = dhInputGeo.asMesh();
             TF_VERIFY(inputGeo.hasFn(MFn::kMesh));