|
@@ -104,7 +104,7 @@ class BlendSpace2D extends h3d.anim.Animation {
|
|
|
// copy modified matrices references
|
|
|
@:privateAccess
|
|
|
for (object in point.objects) {
|
|
|
- object.matrices[ptIndex] = (if( object.targetSkin != null ) object.targetSkin.jointsData[object.targetJoint].currentRelPose else object.targetObject.defaultTransform) ?? object.matrices[ptIndex];
|
|
|
+ object.matrices[ptIndex] = (if( object.targetSkin != null ) object.targetSkin.jointsData[object.targetJoint].currentRelPose else object.targetObject?.defaultTransform) ?? object.matrices[ptIndex];
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -163,7 +163,10 @@ class BlendSpace2D extends h3d.anim.Animation {
|
|
|
outMatrix.recomposeMatrix(outMatrix);
|
|
|
}
|
|
|
|
|
|
- @:privateAccess if( object.targetSkin != null ) object.targetSkin.jointsData[object.targetJoint].currentRelPose = outMatrix else object.targetObject.defaultTransform = outMatrix;
|
|
|
+ @:privateAccess if( object.targetSkin != null )
|
|
|
+ object.targetSkin.jointsData[object.targetJoint].currentRelPose = outMatrix;
|
|
|
+ else if( object.targetObject != null )
|
|
|
+ object.targetObject.defaultTransform = outMatrix;
|
|
|
}
|
|
|
}
|
|
|
|