Rollback of http://projects.blender.org/pipermail/bf-blender-cvs/2005-June/003769.html (which I in my commithappyness did before properly checking)

6 files changed, 10 insertions, 9 deletions

diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index d1abad9a0df..848f82c78b5 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -179,6 +179,8 @@ typedef struct Global {
 #define G_DRAW_FACEAREA (1 << 23)
 #define G_DRAW_EDGEANG  (1 << 24)
 
+#define G_RECORDKEYS  (1 << 25)
+
 /* G.fileflags */
 
 #define G_AUTOPACK_BIT                  0
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index b050b226bbd..51089cfc636 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -178,7 +178,6 @@ extern UserDef U; /* from usiblender.c !!!! */
 #define USER_TWOBUTTONMOUSE		4096
 #define USER_NONUMPAD			8192
 #define USER_LMOUSESELECT		16384
-#define USER_RECORDKEYS			32768
 
 /* viewzom */
 #define USER_ZOOM_CONT			0
diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c
index fcb59baea47..3db1407b4c9 100644
--- a/source/blender/src/editaction.c
+++ b/source/blender/src/editaction.c
@@ -970,7 +970,7 @@ void paste_posebuf (int flip){
 
 				temp = set_pose_channel (ob->pose, temp);
 
-				if (U.flag & USER_RECORDKEYS){
+				if (G.flags & G_RECORDKEYS){
 					/* Set keys on pose */
 					if (chan->flag & POSE_ROT){
 						set_action_key(ob->action, temp, AC_QUAT_X, newchan);
@@ -992,7 +992,7 @@ void paste_posebuf (int flip){
 			}
 		}
 
-		if (U.flag & USER_RECORDKEYS) {
+		if (G.flags & G_RECORDKEYS) {
 			remake_action_ipos(ob->action);
 			allqueue (REDRAWIPO, 0);
 			allqueue (REDRAWVIEW3D, 0);
diff --git a/source/blender/src/header_time.c b/source/blender/src/header_time.c
index dd0ced7d9fe..2c7a5423abd 100644
--- a/source/blender/src/header_time.c
+++ b/source/blender/src/header_time.c
@@ -440,8 +440,8 @@ void time_buttons(ScrArea *sa)
 			xco, 0, XIC, YIC, 0, 0, 0, 0, 0, "Skip to End frame (Shift UpArrow)");
 	xco+= XIC+8;
 	
-	uiDefIconButBitI(block, TOG, USER_RECORDKEYS, REDRAWINFO, ICON_REC,
-			xco, 0, XIC, YIC, &(U.flag), 0, 0, 0, 0, "Automatically insert keyframes in Object and Action Ipo curves");
+	uiDefIconButBitI(block, TOG, G_RECORDKEYS, REDRAWINFO, ICON_REC,
+			xco, 0, XIC, YIC, &(G.flags), 0, 0, 0, 0, "Automatically insert keyframes in Object and Action Ipo curves");
 	
 	xco+= XIC+16;
 
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 6087ba03054..0f5351ea612 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -2589,9 +2589,9 @@ void drawinfospace(ScrArea *sa, void *spacedata)
 		uiDefBut(block, LABEL,0,"Auto keyframe",
 			(xpos+(2*edgsp)+(2*mpref)+midsp),y3label,mpref,buth,
 			0, 0, 0, 0, 0, "");
-		uiDefButBitI(block, TOG, USER_RECORDKEYS, REDRAWTIME, "Action and Object", 
+		uiDefButBitI(block, TOG, G_RECORDKEYS, REDRAWTIME, "Action and Object", 
 					(xpos+edgsp+(2*mpref)+(2*midsp)),y2,mpref, buth,
-					 &(U.flag), 0, 0, 0, 0, "Automatic keyframe insertion in Object and Action Ipo curves");
+					 &(G.flags), 0, 0, 0, 0, "Automatic keyframe insertion in Object and Action Ipo curves");
 
 //		uiDefButBitS(block, TOG, USER_KEYINSERTACT, 0, "Action",
 //			(xpos+edgsp+(2*mpref)+(2*midsp)),y2,(spref+edgsp),buth,
diff --git a/source/blender/src/transform_conversions.c b/source/blender/src/transform_conversions.c
index 4848fc0d5fd..bb966028222 100755
--- a/source/blender/src/transform_conversions.c
+++ b/source/blender/src/transform_conversions.c
@@ -1865,7 +1865,7 @@ void special_aftertrans_update(char mode, int flip, short canceled, int keyflags
 			*/
 		clear_bone_nocalc_ob(G.obpose);
 		
-		if ((U.flag & USER_RECORDKEYS) && !canceled){
+		if ((G.flags & G_RECORDKEYS) && !canceled){
 			act=G.obpose->action;
 			pose=G.obpose->pose;
 			
@@ -1973,7 +1973,7 @@ void special_aftertrans_update(char mode, int flip, short canceled, int keyflags
 			where_is_object(ob);	/* always do, for track etc. */
 			
 			/* Set autokey if necessary */
-			if ((U.flag & USER_RECORDKEYS) && (!canceled) && (base->flag & SELECT)){
+			if ((G.flags & G_RECORDKEYS) && (!canceled) && (base->flag & SELECT)){
 				if (keyflags){
 					insertkey(&base->object->id, OB_ROT_X);
 					insertkey(&base->object->id, OB_ROT_Y);