[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12528] trunk/blender/source/blender:

[Brecht Van Lommel]

Revision: 12528
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12528
Author:   blendix
Date:     2007-11-08 19:02:15 +0100 (Thu, 08 Nov 2007)

Log Message:
-----------

Bugfix:
Issue with dual quaternion scaling + vertex group influence.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/armature.c
    trunk/blender/source/blender/blenlib/BLI_arithb.h
    trunk/blender/source/blender/blenlib/intern/arithb.c

Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c	2007-11-08 15:57:18 UTC (rev 12527)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c	2007-11-08 18:02:15 UTC (rev 12528)
@@ -969,7 +969,7 @@
 		/* actually should be EPSILON? weight values and contrib can be like 10e-39 small */
 		if(contrib > 0.0001f) {
 			if(use_quaternion) {
-				DQuatNormalize(dq, contrib, armature_weight);
+				DQuatNormalize(dq, contrib);
 
 				if(armature_weight != 1.0f) {
 					VECCOPY(dco, co);

Modified: trunk/blender/source/blender/blenlib/BLI_arithb.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_arithb.h	2007-11-08 15:57:18 UTC (rev 12527)
+++ trunk/blender/source/blender/blenlib/BLI_arithb.h	2007-11-08 18:02:15 UTC (rev 12528)
@@ -373,7 +373,7 @@
 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);
 			  

Modified: trunk/blender/source/blender/blenlib/intern/arithb.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/arithb.c	2007-11-08 15:57:18 UTC (rev 12527)
+++ trunk/blender/source/blender/blenlib/intern/arithb.c	2007-11-08 18:02:15 UTC (rev 12528)
@@ -1739,9 +1739,9 @@
 	}
 }
 
-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);