Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2007-08-06 18:32:10 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2007-08-06 18:32:10 +0400
commitfbb6a133dfca8eb3f86e70d5d756bff4f4cfc21e (patch)
treec3d12d0429e5e03497678befa31cbb7f7d68c18c /source/blender/blenlib
parent6af121b4077fc60815aa6ddcbf438bcad0925c19 (diff)
Bugfix:
Crazyspace correction for quaternion deform interpolation was broken.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r--source/blender/blenlib/intern/arithb.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index 237b446bf2c..72e18b3f1da 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -1801,8 +1801,12 @@ void DQuatMulVecfl(DualQuat *dq, float *co, float mat[][3])
/* compute crazyspace correction mat */
if(mat) {
- Mat3CpyMat4(scalemat, dq->scale);
- Mat3MulMat3(mat, M, scalemat);
+ if(dq->scale_weight) {
+ Mat3CpyMat4(scalemat, dq->scale);
+ Mat3MulMat3(mat, M, scalemat);
+ }
+ else
+ Mat3CpyMat3(mat, M);
Mat3MulFloat((float*)mat, len2);
}
}