archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

* fix for bug #2733

Browse Source
This commit is contained in:
Nathan Letwory
2005-06-10 13:55:09 +00:00
parent f73183ae49
commit 07fb86d355
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_global.h
View File

@@ -179,8 +179,6 @@ typedef struct Global {
#define G_DRAW_FACEAREA (1 << 23) #define G_DRAW_FACEAREA (1 << 23)
#define G_DRAW_EDGEANG (1 << 24) #define G_DRAW_EDGEANG (1 << 24)
#define G_RECORDKEYS (1 << 25)
/* G.fileflags */ /* G.fileflags */
#define G_AUTOPACK_BIT 0 #define G_AUTOPACK_BIT 0

1
source/blender/makesdna/DNA_userdef_types.h
View File

@@ -178,6 +178,7 @@ extern UserDef U; /* from usiblender.c !!!! */
#define USER_TWOBUTTONMOUSE 4096 #define USER_TWOBUTTONMOUSE 4096
#define USER_NONUMPAD 8192 #define USER_NONUMPAD 8192
#define USER_LMOUSESELECT 16384 #define USER_LMOUSESELECT 16384
#define USER_RECORDKEYS 32768
/* viewzom */ /* viewzom */
#define USER_ZOOM_CONT 0 #define USER_ZOOM_CONT 0

4
source/blender/src/editaction.c
View File

@@ -970,7 +970,7 @@ void paste_posebuf (int flip){
temp = set_pose_channel (ob->pose, temp); temp = set_pose_channel (ob->pose, temp);
if (G.flags & G_RECORDKEYS){ if (U.flag & USER_RECORDKEYS){
/* Set keys on pose */ /* Set keys on pose */
if (chan->flag & POSE_ROT){ if (chan->flag & POSE_ROT){
set_action_key(ob->action, temp, AC_QUAT_X, newchan); 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); remake_action_ipos(ob->action);
allqueue (REDRAWIPO, 0); allqueue (REDRAWIPO, 0);
allqueue (REDRAWVIEW3D, 0); allqueue (REDRAWVIEW3D, 0);

4
source/blender/src/header_time.c
View File

@@ -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, 0, XIC, YIC, 0, 0, 0, 0, 0, "Skip to End frame (Shift UpArrow)");
xco+= XIC+8; xco+= XIC+8;
uiDefIconButBitI(block, TOG, G_RECORDKEYS, REDRAWINFO, ICON_REC, uiDefIconButBitI(block, TOG, USER_RECORDKEYS, REDRAWINFO, ICON_REC,
xco, 0, XIC, YIC, &(G.flags), 0, 0, 0, 0, "Automatically insert keyframes in Object and Action Ipo curves"); xco, 0, XIC, YIC, &(U.flag), 0, 0, 0, 0, "Automatically insert keyframes in Object and Action Ipo curves");
xco+= XIC+16; xco+= XIC+16;

4
source/blender/src/space.c
View File

@@ -2589,9 +2589,9 @@ void drawinfospace(ScrArea *sa, void *spacedata)
uiDefBut(block, LABEL,0,"Auto keyframe", uiDefBut(block, LABEL,0,"Auto keyframe",
(xpos+(2*edgsp)+(2*mpref)+midsp),y3label,mpref,buth, (xpos+(2*edgsp)+(2*mpref)+midsp),y3label,mpref,buth,
0, 0, 0, 0, 0, ""); 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, (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", // uiDefButBitS(block, TOG, USER_KEYINSERTACT, 0, "Action",
// (xpos+edgsp+(2*mpref)+(2*midsp)),y2,(spref+edgsp),buth, // (xpos+edgsp+(2*mpref)+(2*midsp)),y2,(spref+edgsp),buth,

4
source/blender/src/transform_conversions.c
View File

@@ -1849,7 +1849,7 @@ void special_aftertrans_update(char mode, int flip, short canceled, int keyflags
*/ */
clear_bone_nocalc_ob(G.obpose); clear_bone_nocalc_ob(G.obpose);
if ((G.flags & G_RECORDKEYS) && !canceled){ if ((U.flag & USER_RECORDKEYS) && !canceled){
act=G.obpose->action; act=G.obpose->action;
pose=G.obpose->pose; 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. */ where_is_object(ob); /* always do, for track etc. */
/* Set autokey if necessary */ /* Set autokey if necessary */
if ((G.flags & G_RECORDKEYS) && (!canceled) && (base->flag & SELECT)){ if ((U.flag & USER_RECORDKEYS) && (!canceled) && (base->flag & SELECT)){
if (keyflags){ if (keyflags){
insertkey(&base->object->id, OB_ROT_X); insertkey(&base->object->id, OB_ROT_X);
insertkey(&base->object->id, OB_ROT_Y); insertkey(&base->object->id, OB_ROT_Y);