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-11-08 21:02:15 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2007-11-08 21:02:15 +0300
commit7294d19d6682f2486e9419074b56bebd050a940e (patch)
treef4c9178944e02c1a41257d7e354911fe57609e0b /source/blender/blenlib
parent4b38620d3f9cc976414a8f50b9ae6ec79a48b636 (diff)
Bugfix:
Issue with dual quaternion scaling + vertex group influence.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r--source/blender/blenlib/BLI_arithb.h2
-rw-r--r--source/blender/blenlib/intern/arithb.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index d5e7447ff66..9e4412d3cd3 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -373,7 +373,7 @@ typedef struct DualQuat {
void Mat4ToDQuat(float basemat[][4], float mat[][4], DualQuat *dq);
void DQuatToMat4(DualQuat *dq, float mat[][4]);
void DQuatAddWeighted(DualQuat *dqsum, DualQuat *dq, float weight);
-void DQuatNormalize(DualQuat *dq, float totweight, float factor);
+void DQuatNormalize(DualQuat *dq, float totweight);
void DQuatMulVecfl(DualQuat *dq, float *co, float mat[][3]);
void DQuatCpyDQuat(DualQuat *dq1, DualQuat *dq2);
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index 721df3a1a0c..5a37205af01 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -1739,9 +1739,9 @@ void DQuatAddWeighted(DualQuat *dqsum, DualQuat *dq, float weight)
}
}
-void DQuatNormalize(DualQuat *dq, float totweight, float factor)
+void DQuatNormalize(DualQuat *dq, float totweight)
{
- float scale= factor/totweight;
+ float scale= 1.0f/totweight;
QuatMulf(dq->quat, scale);
QuatMulf(dq->trans, scale);