[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40774] trunk/blender/source/blender/ editors/transform/transform.c: fix for [#28788] wasn't complete, pose bones scale was ignoring "Individual origins" setting.

Campbell Barton ideasman42 at gmail.com
Mon Oct 3 18:20:06 CEST 2011


Revision: 40774
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40774
Author:   campbellbarton
Date:     2011-10-03 16:20:05 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
fix for [#28788] wasn't complete, pose bones scale was ignoring "Individual origins" setting.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform.c

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2011-10-03 15:31:45 UTC (rev 40773)
+++ trunk/blender/source/blender/editors/transform/transform.c	2011-10-03 16:20:05 UTC (rev 40774)
@@ -2606,29 +2606,18 @@
 	}
 	
 	/* local constraint shouldn't alter center */
-	if (t->around == V3D_LOCAL) {
-		if (t->flag & T_OBJECT) {
-			copy_v3_v3(center, td->center);
-		}
-		else if (t->flag & T_EDIT) {
-
-			if(     (t->settings->selectmode & SCE_SELECT_FACE) ||
-			        (t->obedit && t->obedit->type == OB_ARMATURE))
-			{
-				copy_v3_v3(center, td->center);
-			}
-			else {
-				copy_v3_v3(center, t->center);
-			}
-		}
-		else {
-			copy_v3_v3(center, t->center);
-		}
+	if ((t->around == V3D_LOCAL) &&
+	        (   (t->flag & (T_OBJECT|T_POSE)) ||
+	            ((t->flag & T_EDIT) && (t->settings->selectmode & SCE_SELECT_FACE)) ||
+	            (t->obedit && t->obedit->type == OB_ARMATURE))
+	        )
+	{
+		copy_v3_v3(center, td->center);
 	}
 	else {
 		copy_v3_v3(center, t->center);
 	}
-	
+
 	if (td->ext) {
 		float fsize[3];
 		




More information about the Bf-blender-cvs mailing list