Merge pull request #3954 from Autodesk/barbalt/EMSUSD-1712/reimport-b…

…lendshape-fix

EMSUSD-1712 Reimport blendshape issues

lib/mayaUsd/fileio/translators/translatorBlendShape.cpp

@@ -149,6 +149,10 @@ bool UsdMayaTranslatorBlendShape::Read(const UsdPrim& meshPrim, UsdMayaPrimReade
     const auto            blendShapeObj
         = blendFn.create(objToBlendShape, MFnBlendShapeDeformer::kLocalOrigin, &status);
     CHECK_MSTATUS_AND_RETURN(status, false)
+    MFnDependencyNode blendShapeDepNodeFn;
+    blendShapeDepNodeFn.setObject(blendShapeObj);
+    blendShapeDepNodeFn.setName(MString(
+        TfStringPrintf("%s_Deformer", meshPrim.GetPath().GetElementString().c_str()).c_str()));
 
     MObject      deformedMeshObject;
     VtVec3fArray deltaPoints, deltaNormals;

lib/mayaUsd/fileio/translators/translatorSkel.cpp

@@ -17,6 +17,7 @@
 
 #include <mayaUsd/fileio/translators/translatorUtil.h>
 #include <mayaUsd/fileio/translators/translatorXformable.h>
+#include <mayaUsd/fileio/utils/meshWriteUtils.h>
 #include <mayaUsd/undo/OpUndoItems.h>
 #include <mayaUsd/utils/util.h>
 
@@ -28,21 +29,18 @@
 #include <pxr/usd/usdSkel/topology.h>
 
 #include <maya/MDGModifier.h>
-#include <maya/MDagModifier.h>
 #include <maya/MDoubleArray.h>
 #include <maya/MEulerRotation.h>
 #include <maya/MFnAnimCurve.h>
+#include <maya/MFnBlendShapeDeformer.h>
 #include <maya/MFnComponentListData.h>
 #include <maya/MFnDependencyNode.h>
-#include <maya/MFnDoubleArrayData.h>
-#include <maya/MFnMatrixData.h>
 #include <maya/MFnMesh.h>
 #include <maya/MFnNumericAttribute.h>
 #include <maya/MFnSingleIndexedComponent.h>
 #include <maya/MFnSkinCluster.h>
 #include <maya/MFnTransform.h>
 #include <maya/MMatrix.h>
-#include <maya/MObjectHandle.h>
 #include <maya/MPlug.h>
 #include <maya/MPlugArray.h>
 
@@ -1317,8 +1315,27 @@ bool UsdMayaTranslatorSkel::CreateSkinCluster(
 
             const auto skinSrc = shapeToSkinInMesh.source();
             if (!skinSrc.isNull()) {
+                MObjectArray blendShapeDeformers;
+                UsdMayaMeshWriteUtils::getBlendShapesOfMesh(
+                    shapeToSkin, blendShapeDeformers, &status);
+
                 dgMod.disconnect(skinSrc, shapeToSkinInMesh);
-                status = dgMod.connect(skinSrc, groupPartsInputGeometry);
+
+                // If the mesh has blendShapes, it has already been created prior to this step.
+                // When that's the case, we need to disconnect the blendShape outputGeometry
+                // and connect it to the groupParts.inputGeometry which drives the skel/skinCluster.
+                // Then, the output of the groupParts will be connected to the end mesh.
+                if (blendShapeDeformers.length() > 0) {
+                    MFnBlendShapeDeformer blendShapeFn(blendShapeDeformers[0], &status);
+                    MPlug                 blenshapeOutputPlug
+                        = blendShapeFn.findPlug(_MayaTokens->outputGeometry, &status);
+                    MPlug blenshapeOutputPlug0
+                        = blenshapeOutputPlug.elementByLogicalIndex(0, &status);
+
+                    status = dgMod.connect(blenshapeOutputPlug0, groupPartsInputGeometry);
+                } else {
+                    status = dgMod.connect(skinSrc, groupPartsInputGeometry);
+                }
                 CHECK_MSTATUS_AND_RETURN(status, false);
             } else {
                 // For the case where there were no blendShapes attached to the mesh, create a rest

lib/mayaUsd/fileio/utils/meshWriteUtils.cpp

@@ -419,6 +419,36 @@ MStatus UsdMayaMeshWriteUtils::getSkinClustersUpstreamOfMesh(
     return stat;
 }
 
+void UsdMayaMeshWriteUtils::getBlendShapesOfMesh(
+    const MObject& mesh,
+    MObjectArray&  blendShapes,
+    MStatus*       stat)
+{
+    if (mesh.isNull() || !mesh.hasFn(MFn::kMesh)) {
+        if (stat) {
+            *stat = MStatus::kInvalidParameter;
+        }
+        return;
+    }
+
+    blendShapes.clear();
+    MObject            searchObj = MObject(mesh);
+    MItDependencyGraph itDg(
+        searchObj,
+        MFn::kInvalid,
+        MItDependencyGraph::kUpstream,
+        MItDependencyGraph::kDepthFirst,
+        MItDependencyGraph::kNodeLevel,
+        stat);
+    while (!itDg.isDone()) {
+        MObject curNode = itDg.currentItem();
+        if (curNode.hasFn(MFn::kBlendShape)) {
+            blendShapes.append(curNode);
+        }
+        itDg.next();
+    }
+}
+
 MBoundingBox UsdMayaMeshWriteUtils::calcBBoxOfMeshes(const MObjectArray& meshes)
 {
     unsigned int numMeshes = meshes.length();

lib/mayaUsd/fileio/utils/meshWriteUtils.h

@@ -66,15 +66,17 @@ MStatus getSkinClusterConnectedToMesh(const MObject& mesh, MObject& skinCluster)
 MAYAUSD_CORE_PUBLIC
 MStatus getSkinClustersUpstreamOfMesh(const MObject& mesh, MObjectArray& skinClusters);
 
+MAYAUSD_CORE_PUBLIC
+void getBlendShapesOfMesh(const MObject& mesh, MObjectArray& blendShapes, MStatus* stat);
+
 /**
  * Calculates the union bounding box of a given array of meshes.
  *
  * @param meshes    The meshes to calculate the union bounding box of.
  *
  * @return          The union bounding box.
  */
-MAYAUSD_CORE_PUBLIC
-MBoundingBox calcBBoxOfMeshes(const MObjectArray& meshes);
+MAYAUSD_CORE_PUBLIC MBoundingBox calcBBoxOfMeshes(const MObjectArray& meshes);
 
 /// Helper method for getting Maya mesh normals as a VtVec3fArray.
 MAYAUSD_CORE_PUBLIC

lib/usd/translators/meshWriterBlendShapes.cpp

@@ -666,16 +666,9 @@ MObject PxrUsdTranslators_MeshWriter::writeBlendShapeData(UsdGeomMesh& primSchem
                     MString                   curTargetLongNameMStr;
                     if (!targetMesh.isNull()) {
                         MFnDagNode dagNode(targetMesh);
-                        MString    nodeName;
-                        if (dagNode.parentCount() > 0) {
-                            MFnDagNode parentDagNode(dagNode.parent(0));
-                            curTargetNameMStr
-                                = UsdMayaUtil::GetUniqueNameOfDagNode(parentDagNode.object());
-                            curTargetLongNameMStr = curTargetNameMStr;
-                        } else {
-                            curTargetNameMStr = UsdMayaUtil::GetUniqueNameOfDagNode(targetMesh);
-                            curTargetLongNameMStr = curTargetNameMStr;
-                        }
+                        curTargetNameMStr = UsdMayaUtil::GetUniqueNameOfDagNode(targetMesh);
+                        curTargetLongNameMStr = curTargetNameMStr;
+
                         // NOTE: (yliangsiew) Because UsdSkelBlendShape does not
                         // support animated targets (the `normalOffsets` and
                         // `offsets` attributes are defined as uniforms), we cannot

test/lib/usd/translators/testUsdExportBlendshapes.py

@@ -58,7 +58,7 @@ def testBlendShapesExport(self):
         cmds.mayaUSDExport(f=temp_file, v=True, sl=True, ebs=True, skl="auto")
 
         stage = Usd.Stage.Open(temp_file)
-        prim = stage.GetPrimAtPath("/root/base/blend")
+        prim = stage.GetPrimAtPath("/root/base/blendShape")
         offsets = prim.GetAttribute("offsets").Get()
 
         for i, coords in enumerate(offsets):
@@ -68,7 +68,7 @@ def testBlendShapesExport(self):
         """
         Sample BlendShape prim:
 
-        def BlendShape "blend"
+        def BlendShape "blendShape"
         {
             uniform vector3f[] normalOffsets = [(0, 0, 0), (0, 0, 0), (0, 0, 0)]
             uniform vector3f[] offsets = [(0, -0.25, 0), (0, -0.25, 0), (0, 0.25, 0)]

test/lib/usd/translators/testUsdImportBlendShapes.py

@@ -66,28 +66,28 @@ def test_BlendShapesImport(self):
         skinningQuery = skelCache.GetSkinningQuery(meshPrim)
         self.assertTrue(skinningQuery)
 
-        self.assertEqual(cmds.nodeType("blendShape1"), "blendShape")
+        self.assertEqual(cmds.nodeType("b1_Deformer"), "blendShape")
 
         regularShape = sorted(
                 cmds.listConnections(
-                    "blendShape1.inputTarget[0].inputTargetGroup[0].inputTargetItem[6000].inputGeomTarget", 
+                    "b1_Deformer.inputTarget[0].inputTargetGroup[0].inputTargetItem[6000].inputGeomTarget", 
                     destination=False, source=True, plugs=True))
         self.assertEqual(regularShape, ['Box0002.worldMesh'])
 
         inBetween = sorted(
                 cmds.listConnections(
-                    "blendShape1.inputTarget[0].inputTargetGroup[0].inputTargetItem[4000].inputGeomTarget", 
+                    "b1_Deformer.inputTarget[0].inputTargetGroup[0].inputTargetItem[4000].inputGeomTarget", 
                     destination=False, source=True, plugs=True))
         self.assertEqual(inBetween, ['IBT_1.worldMesh'])
 
         cmds.currentTime(0)
-        self.assertEqual(sorted(cmds.getAttr("blendShape1.weight")[0]), [-1.0])
+        self.assertEqual(sorted(cmds.getAttr("b1_Deformer.weight")[0]), [-1.0])
         cmds.currentTime(3)
-        self.assertEqual(sorted(cmds.getAttr("blendShape1.weight")[0]), [-0.14404296875])
+        self.assertEqual(sorted(cmds.getAttr("b1_Deformer.weight")[0]), [-0.14404296875])
         cmds.currentTime(5)
-        self.assertEqual(sorted(cmds.getAttr("blendShape1.weight")[0]), [0.13427734375])
+        self.assertEqual(sorted(cmds.getAttr("b1_Deformer.weight")[0]), [0.13427734375])
         cmds.currentTime(8)
-        self.assertEqual(sorted(cmds.getAttr("blendShape1.weight")[0]), [1.0])
+        self.assertEqual(sorted(cmds.getAttr("b1_Deformer.weight")[0]), [1.0])
 
 
 if __name__ == '__main__':