From bd321b8afe485138bd81785cbdf36f0a27378528 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Fri, 25 Jan 2008 11:27:38 +0000 Subject: [PATCH] Two bugfixes: * Buttons to change position of constraints in constraint stack are now totally hidden if they don't do anything valid. It'll have to be this way until we get grey-able buttons. * Duplicating keyframes in Action Editor now sets correct undo-string --- source/blender/src/buttons_object.c | 15 ++------------- source/blender/src/editaction.c | 1 + 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index 32218c27ace..fc562229d7e 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -602,13 +602,8 @@ static void draw_constraint (uiBlock *block, ListBase *list, bConstraint *con, s uiBlockBeginAlign(block); uiBlockSetEmboss(block, UI_EMBOSS); - if ((prev_proxylock) || (con->prev==NULL)) { - /* don't draw 'button' behind arrow if disabled (and button doesn't do anything anyways) */ - uiBlockSetEmboss(block, UI_EMBOSSN); - uiDefIconBut(block, BUT, B_CONSTRAINT_TEST, VICON_MOVE_UP, *xco+width-50, *yco, 16, 18, NULL, 0.0, 0.0, 0.0, 0.0, "Move constraint up in constraint stack"); - uiBlockSetEmboss(block, UI_EMBOSS); - } - else { + /* only show buttons that will do anything valid */ + if ((prev_proxylock==0) && (con->prev)) { but = uiDefIconBut(block, BUT, B_CONSTRAINT_TEST, VICON_MOVE_UP, *xco+width-50, *yco, 16, 18, NULL, 0.0, 0.0, 0.0, 0.0, "Move constraint up in constraint stack"); uiButSetFunc(but, constraint_moveUp, ob, con); } @@ -617,12 +612,6 @@ static void draw_constraint (uiBlock *block, ListBase *list, bConstraint *con, s but = uiDefIconBut(block, BUT, B_CONSTRAINT_TEST, VICON_MOVE_DOWN, *xco+width-50+18, *yco, 16, 18, NULL, 0.0, 0.0, 0.0, 0.0, "Move constraint down in constraint stack"); uiButSetFunc(but, constraint_moveDown, ob, con); } - else { - /* don't draw 'button' behind arrow if no next constraint (it doesn't do anything anyways) */ - uiBlockSetEmboss(block, UI_EMBOSSN); - uiDefIconBut(block, BUT, B_CONSTRAINT_TEST, VICON_MOVE_DOWN, *xco+width-50+18, *yco, 16, 18, NULL, 0.0, 0.0, 0.0, 0.0, "Move constraint down in constraint stack"); - uiBlockSetEmboss(block, UI_EMBOSS); - } uiBlockEndAlign(block); diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c index 6c9e6ce1f6f..1c091ed39d9 100644 --- a/source/blender/src/editaction.c +++ b/source/blender/src/editaction.c @@ -1160,6 +1160,7 @@ void duplicate_action_keys (void) BLI_freelistN(&act_data); /* now, go into transform-grab mode, to move keys */ + BIF_TransformSetUndo("Add Duplicate"); transform_action_keys('g', 0); }