[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43840] trunk/blender/source/blender/ blenkernel/intern/constraint.c: fix [#30051] Copy Scale constraint overrides Inherit Scale from parent

[Campbell Barton]

Revision: 43840
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43840
Author:   campbellbarton
Date:     2012-02-02 08:04:06 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
fix [#30051] Copy Scale constraint overrides Inherit Scale from parent

space conversion in constraint code ignored inherit scale option. 

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/constraint.c

Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c	2012-02-02 07:37:44 UTC (rev 43839)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c	2012-02-02 08:04:06 UTC (rev 43840)
@@ -287,8 +287,17 @@
 								invert_m4_m4(imat, diff_mat);
 							}
 							else {
+								if (pchan->bone->flag & BONE_NO_SCALE) {
+									float tmat[4][4];
+									copy_m4_m4(tmat, pchan->parent->pose_mat);
+									normalize_m4(tmat);
+									mult_m4_m4m4(diff_mat, tmat, offs_bone);
+								}
+								else {
+									mult_m4_m4m4(diff_mat, pchan->parent->pose_mat, offs_bone);
+								}
+
 								/* pose_mat = par_pose_mat * bone_mat * chan_mat */
-								mult_m4_m4m4(diff_mat, pchan->parent->pose_mat, offs_bone);
 								invert_m4_m4(imat, diff_mat);
 							}
 						}
@@ -348,7 +357,16 @@
 						}
 						else {
 							/* pose_mat = par_pose_mat * bone_mat * chan_mat */
-							mult_m4_m4m4(diff_mat, pchan->parent->pose_mat, offs_bone);
+							if (pchan->bone->flag & BONE_NO_SCALE) {
+								float tmat[4][4];
+								copy_m4_m4(tmat, pchan->parent->pose_mat);
+								normalize_m4(tmat);
+								mult_m4_m4m4(diff_mat, tmat, offs_bone);
+							}
+							else {
+								mult_m4_m4m4(diff_mat, pchan->parent->pose_mat, offs_bone);
+							}
+
 							copy_m4_m4(tempmat, mat);
 							mult_m4_m4m4(mat, diff_mat, tempmat);
 						}