diff options
-rw-r--r-- | source/blender/blenkernel/BKE_global.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 1 | ||||
-rw-r--r-- | source/blender/src/editaction.c | 4 | ||||
-rw-r--r-- | source/blender/src/header_time.c | 4 | ||||
-rw-r--r-- | source/blender/src/space.c | 4 | ||||
-rwxr-xr-x | source/blender/src/transform_conversions.c | 4 |
6 files changed, 9 insertions, 10 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index ae9929b9a2a..d1abad9a0df 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -179,8 +179,6 @@ 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 51089cfc636..b050b226bbd 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -178,6 +178,7 @@ 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 f7fdb5007fb..fcb59baea47 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 (G.flags & G_RECORDKEYS){ + if (U.flag & USER_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 (G.flags & G_RECORDKEYS){ + if (U.flag & USER_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 2c7a5423abd..dd0ced7d9fe 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, G_RECORDKEYS, REDRAWINFO, ICON_REC, - xco, 0, XIC, YIC, &(G.flags), 0, 0, 0, 0, "Automatically insert keyframes in Object and Action Ipo curves"); + 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"); xco+= XIC+16; diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 0f5351ea612..6087ba03054 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, G_RECORDKEYS, REDRAWTIME, "Action and Object", + uiDefButBitI(block, TOG, USER_RECORDKEYS, REDRAWTIME, "Action and Object", (xpos+edgsp+(2*mpref)+(2*midsp)),y2,mpref, buth, - &(G.flags), 0, 0, 0, 0, "Automatic keyframe insertion in Object and Action Ipo curves"); + &(U.flag), 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 40bc00593cf..b595bfc8667 100755 --- a/source/blender/src/transform_conversions.c +++ b/source/blender/src/transform_conversions.c @@ -1849,7 +1849,7 @@ void special_aftertrans_update(char mode, int flip, short canceled, int keyflags */ clear_bone_nocalc_ob(G.obpose); - if ((G.flags & G_RECORDKEYS) && !canceled){ + if ((U.flag & USER_RECORDKEYS) && !canceled){ act=G.obpose->action; pose=G.obpose->pose; @@ -1957,7 +1957,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 ((G.flags & G_RECORDKEYS) && (!canceled) && (base->flag & SELECT)){ + if ((U.flag & USER_RECORDKEYS) && (!canceled) && (base->flag & SELECT)){ if (keyflags){ insertkey(&base->object->id, OB_ROT_X); insertkey(&base->object->id, OB_ROT_Y); |