Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2005-05-05 22:31:39 +0400
committerTon Roosendaal <ton@blender.org>2005-05-05 22:31:39 +0400
commitb33536cdaa4639d002f52efa13f8cd450b87a5fb (patch)
tree0eb09db6b7656b04837a6d86ce225311717494a0 /source/blender/src/space.c
parent2b0f00d4bdf3b668517bb4d80881755b5b462fdd (diff)
Two little issues for Timeline window;
- Using Arrowkeys to change frames didn't give proper redraw - Option "Record" now tied to the User-preset "Auto key insert". It is no user preset anymore even, I thought to leave a button in the User- presets for the time being though...
Diffstat (limited to 'source/blender/src/space.c')
-rw-r--r--source/blender/src/space.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 666997b4f36..63052d8f0ac 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -2556,15 +2556,19 @@ void drawinfospace(ScrArea *sa, void *spacedata)
&(U.uiflag), 2, 64, 0, 0, "");
- uiDefBut(block, LABEL,0,"Auto keyframe on:",
+ uiDefBut(block, LABEL,0,"Auto keyframe",
(xpos+(2*edgsp)+(2*mpref)+midsp),y3label,mpref,buth,
0, 0, 0, 0, 0, "");
- uiDefButBitS(block, TOG, USER_KEYINSERTACT, 0, "Action",
- (xpos+edgsp+(2*mpref)+(2*midsp)),y2,(spref+edgsp),buth,
- &(U.uiflag), 0, 0, 0, 0, "Automatic keyframe insertion in Action Ipo curve");
- uiDefButBitS(block, TOG, USER_KEYINSERTOBJ, 0, "Object",
- (xpos+edgsp+(2*mpref)+(3*midsp)+spref-edgsp),y2,(spref+edgsp),buth,
- &(U.uiflag), 0, 0, 0, 0, "Automatic keyframe insertion in Object Ipo curve");
+ uiDefButBitI(block, TOG, G_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");
+
+// uiDefButBitS(block, TOG, USER_KEYINSERTACT, 0, "Action",
+// (xpos+edgsp+(2*mpref)+(2*midsp)),y2,(spref+edgsp),buth,
+// &(U.uiflag), 0, 0, 0, 0, "Automatic keyframe insertion in Action Ipo curve");
+// uiDefButBitS(block, TOG, USER_KEYINSERTOBJ, 0, "Object",
+// (xpos+edgsp+(2*mpref)+(3*midsp)+spref-edgsp),y2,(spref+edgsp),buth,
+// &(U.uiflag), 0, 0, 0, 0, "Automatic keyframe insertion in Object Ipo curve");
uiDefBut(block, LABEL,0,"Duplicate with object:",
@@ -2940,7 +2944,8 @@ static void winqreadinfospace(ScrArea *sa, void *spacedata, BWinEvent *evt)
switch(event) {
case UI_BUT_EVENT:
- if(val==B_ADD_THEME) {
+ if(val==REDRAWTIME) allqueue(REDRAWTIME, 0);
+ else if(val==B_ADD_THEME) {
bTheme *btheme, *new;
btheme= U.themes.first;