Browse Source

Fix for bug #1057903 based on benchang's patch

rdb 13 years ago
parent
commit
af9ec6eb3c

+ 2 - 2
pandatool/src/mayaegg/mayaBlendDesc.cxx

@@ -23,8 +23,8 @@ TypeHandle MayaBlendDesc::_type_handle;
 //  Description: 
 //  Description: 
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 MayaBlendDesc::
 MayaBlendDesc::
-MayaBlendDesc(MFnBlendShapeDeformer deformer, int weight_index) :
-  _deformer(deformer),
+MayaBlendDesc(MFnBlendShapeDeformer &deformer, int weight_index) :
+  _deformer(deformer.object()),
   _weight_index(weight_index)
   _weight_index(weight_index)
 {
 {
   ostringstream strm;
   ostringstream strm;

+ 1 - 1
pandatool/src/mayaegg/mayaBlendDesc.h

@@ -42,7 +42,7 @@ class EggSAnimData;
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 class MayaBlendDesc : public ReferenceCount, public Namable {
 class MayaBlendDesc : public ReferenceCount, public Namable {
 public:
 public:
-  MayaBlendDesc(MFnBlendShapeDeformer deformer, int weight_index);
+  MayaBlendDesc(MFnBlendShapeDeformer &deformer, int weight_index);
   ~MayaBlendDesc();
   ~MayaBlendDesc();
 
 
   void set_slider(PN_stdfloat value);
   void set_slider(PN_stdfloat value);

+ 1 - 1
pandatool/src/mayaegg/mayaEggLoader.cxx

@@ -370,7 +370,7 @@ MayaEggGroup *MayaEggLoader::MakeGroup(EggGroup *group, EggGroup *context)
     MMatrix mat(matData);
     MMatrix mat(matData);
 
 
     MTransformationMatrix matrix = MTransformationMatrix(mat);
     MTransformationMatrix matrix = MTransformationMatrix(mat);
-    MFnTransform tFn = MFnTransform(result->_group, &status);
+    MFnTransform tFn(result->_group, &status);
     if (status != MStatus::kSuccess) {
     if (status != MStatus::kSuccess) {
       status.perror("MFnTransformNode:create failed!");
       status.perror("MFnTransformNode:create failed!");
     } else {
     } else {

+ 1 - 1
pandatool/src/mayaegg/mayaToEggConverter.cxx

@@ -2360,7 +2360,7 @@ get_vertex_weights(const MDagPath &dag_path, const MFnMesh &mesh,
           status.perror("Can't find connected Joint");
           status.perror("Can't find connected Joint");
         } else {
         } else {
           MObject jointObj = matrix_pa[0].node();
           MObject jointObj = matrix_pa[0].node();
-          MFnIkJoint jointFn = MFnIkJoint(jointObj, &status);
+          MFnIkJoint jointFn(jointObj, &status);
           if (!status) {
           if (!status) {
             status.perror("Can't find connected JointDag");
             status.perror("Can't find connected JointDag");
           } else {
           } else {