[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12440] trunk/blender/source/blender: == Copy Scale Constraint - Offset ==

[Joshua Leung]

Revision: 12440
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12440
Author:   aligorith
Date:     2007-10-31 11:04:57 +0100 (Wed, 31 Oct 2007)

Log Message:
-----------
== Copy Scale Constraint - Offset ==

Now the Copy Scale Constraint also has the Offset functionality that Copy Loc/Rot have. 


== Copy Rotation Constraint == 

Also, fixed the tooltip for the CopyRot Offset button.

Note: when working with pose-bones, and using offset, setting both owner+target spaces to pose-space should cancel any unwanted rotations visible.

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

Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c	2007-10-30 21:56:33 UTC (rev 12439)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c	2007-10-31 10:04:57 UTC (rev 12440)
@@ -1787,12 +1787,30 @@
 		Mat4ToSize(ct->matrix, size);
 		Mat4ToSize(cob->matrix, obsize);
 		
-		if ((data->flag & SIZELIKE_X) && obsize[0] != 0)
-			VecMulf(cob->matrix[0], size[0] / obsize[0]);
-		if ((data->flag & SIZELIKE_Y) && obsize[1] != 0)
-			VecMulf(cob->matrix[1], size[1] / obsize[1]);
-		if ((data->flag & SIZELIKE_Z) && obsize[2] != 0)
-			VecMulf(cob->matrix[2], size[2] / obsize[2]);
+		if ((data->flag & SIZELIKE_X) && (obsize[0] != 0)) {
+			if (data->flag & SIZELIKE_OFFSET) {
+				size[0] += (obsize[0] - 1.0f);
+				VecMulf(cob->matrix[0], size[0] / obsize[0]);
+			}
+			else
+				VecMulf(cob->matrix[0], size[0] / obsize[0]);
+		}
+		if ((data->flag & SIZELIKE_Y) && (obsize[1] != 0)) {
+			if (data->flag & SIZELIKE_OFFSET) {
+				size[1] += (obsize[1] - 1.0f);
+				VecMulf(cob->matrix[1], size[1] / obsize[1]);
+			}
+			else
+				VecMulf(cob->matrix[1], size[1] / obsize[1]);
+		}
+		if ((data->flag & SIZELIKE_Z) && (obsize[2] != 0)) {
+			if (data->flag & SIZELIKE_OFFSET) {
+				size[2] += (obsize[2] - 1.0f);
+				VecMulf(cob->matrix[2], size[2] / obsize[2]);
+			}
+			else
+				VecMulf(cob->matrix[2], size[2] / obsize[2]);
+		}
 	}
 }
 

Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c	2007-10-30 21:56:33 UTC (rev 12439)
+++ trunk/blender/source/blender/src/buttons_object.c	2007-10-31 10:04:57 UTC (rev 12440)
@@ -851,7 +851,7 @@
 				uiBlockEndAlign(block);
 				
 				/* draw offset toggle */
-				uiDefButBitI(block, TOG, ROTLIKE_OFFSET, B_CONSTRAINT_TEST, "Offset", *xco, *yco-64, 80, 18, &data->flag, 0, 24, 0, 0, "Copy X component");
+				uiDefButBitI(block, TOG, ROTLIKE_OFFSET, B_CONSTRAINT_TEST, "Offset", *xco, *yco-64, 80, 18, &data->flag, 0, 24, 0, 0, "Add original rotation onto copied rotation");
 				
 				/* constraint space settings */
 				draw_constraint_spaceselect(block, con, *xco, *yco-94, is_armature_owner(ob), is_armature_target(data->tar));
@@ -891,6 +891,9 @@
 					uiDefButBitI(block, TOG, SIZELIKE_Z, B_CONSTRAINT_TEST, "Z", *xco+((width/2)+16), *yco-64, 32, 18, &data->flag, 0, 24, 0, 0, "Copy Z component");
 				uiBlockEndAlign(block);
 				
+				/* draw offset toggle */
+				uiDefButBitI(block, TOG, SIZELIKE_OFFSET, B_CONSTRAINT_TEST, "Offset", *xco, *yco-64, 80, 18, &data->flag, 0, 24, 0, 0, "Add original scaling onto copied scaling");
+				
 				/* constraint space settings */
 				draw_constraint_spaceselect(block, con, *xco, *yco-94, is_armature_owner(ob), is_armature_target(data->tar));
 			}