[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12436] trunk/blender/source/blender: == Copy Rotation Constraint - Peach (Cessen) Request ==

[Joshua Leung]

Revision: 12436
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12436
Author:   aligorith
Date:     2007-10-30 12:18:50 +0100 (Tue, 30 Oct 2007)

Log Message:
-----------
== Copy Rotation Constraint - Peach (Cessen) Request ==

Copy Rotation constraint now has ability for the owner's rotation to be added on top of the copied rotation (i.e. an 'offset' like for the Copy Location constraint). 

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 05:58:25 UTC (rev 12435)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c	2007-10-30 11:18:50 UTC (rev 12436)
@@ -1695,26 +1695,35 @@
 		Mat4ToEul(ct->matrix, eul);
 		Mat4ToEul(cob->matrix, obeul);
 		
-		if ((data->flag & ROTLIKE_X)==0) {
+		if ((data->flag & ROTLIKE_X)==0)
 			eul[0] = obeul[0];
+		else {
+			if (data->flag & ROTLIKE_OFFSET)
+				euler_rot(eul, obeul[0], 'x');
+			
+			if (data->flag & ROTLIKE_X_INVERT)
+				eul[0] *= -1;
 		}
-		else if (data->flag & ROTLIKE_X_INVERT) {
-			eul[0] *= -1;
-		}	
 		
-		if ((data->flag & ROTLIKE_Y)==0) {
+		if ((data->flag & ROTLIKE_Y)==0)
 			eul[1] = obeul[1];
+		else {
+			if (data->flag & ROTLIKE_OFFSET)
+				euler_rot(eul, obeul[1], 'y');
+			
+			if (data->flag & ROTLIKE_Y_INVERT)
+				eul[1] *= -1;
 		}
-		else if (data->flag & ROTLIKE_Y_INVERT) {
-			eul[1] *= -1;
-		}
 		
-		if ((data->flag & ROTLIKE_Z)==0) {
+		if ((data->flag & ROTLIKE_Z)==0)
 			eul[2] = obeul[2];
+		else {
+			if (data->flag & ROTLIKE_OFFSET)
+				euler_rot(eul, obeul[2], 'z');
+			
+			if (data->flag & ROTLIKE_Z_INVERT)
+				eul[2] *= -1;
 		}
-		else if (data->flag & ROTLIKE_Z_INVERT) {
-			eul[2] *= -1;
-		}
 		
 		compatible_eul(eul, obeul);
 		LocEulSizeToMat4(cob->matrix, loc, eul, size);

Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c	2007-10-30 05:58:25 UTC (rev 12435)
+++ trunk/blender/source/blender/src/buttons_object.c	2007-10-30 11:18:50 UTC (rev 12436)
@@ -850,6 +850,9 @@
 					uiDefButBitI(block, TOG, ROTLIKE_Z_INVERT, B_CONSTRAINT_TEST, "-", *xco+((width/2)+128), *yco-64, 32, 18, &data->flag, 0, 24, 0, 0, "Invert Z component");
 				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");
+				
 				/* constraint space settings */
 				draw_constraint_spaceselect(block, con, *xco, *yco-94, is_armature_owner(ob), is_armature_target(data->tar));
 			}