diff options
| author | Joshua Leung <aligorith@gmail.com> | 2007-08-23 13:42:21 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2007-08-23 13:42:21 +0400 |
| commit | 6ab498defc9585fdd8819ff26391055eac7b5b2c (patch) | |
| tree | b6cc83adf4de3baf0caf667676df74f0097bf186 /source/blender/src | |
| parent | 866218eb15f3ed7beb71f461ee0de051abc398a5 (diff) | |
Several Minor Fixes:
* Grouped Up/Down buttons in constraint panel headers, and fixed their tooltips
* Removed unused variable from action editor code
* Minor formatting in constraint.c
Diffstat (limited to 'source/blender/src')
| -rw-r--r-- | source/blender/src/buttons_object.c | 8 | ||||
| -rw-r--r-- | source/blender/src/editaction.c | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index 40feedd7cc0..ab5726dd6e1 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -564,13 +564,15 @@ static void draw_constraint (uiBlock *block, ListBase *list, bConstraint *con, s /* open/close */ uiDefIconButBitS(block, ICONTOG, CONSTRAINT_EXPAND, B_CONSTRAINT_TEST, ICON_DISCLOSURE_TRI_RIGHT, *xco-10, *yco, 20, 20, &con->flag, 0.0, 0.0, 0.0, 0.0, "Collapse/Expand Constraint"); - /* up down */ + /* up/down */ + uiBlockBeginAlign(block); uiBlockSetEmboss(block, UI_EMBOSS); - 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 modifier up in stack"); + 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); - but = uiDefIconBut(block, BUT, B_CONSTRAINT_TEST, VICON_MOVE_DOWN, *xco+width-50+20, *yco, 16, 18, NULL, 0.0, 0.0, 0.0, 0.0, "Move modifier down in stack"); + 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); + uiBlockEndAlign(block); if (con->flag & CONSTRAINT_EXPAND) { if (con->flag & CONSTRAINT_DISABLE) diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c index f7a5d5f40d3..3ab22fdd051 100644 --- a/source/blender/src/editaction.c +++ b/source/blender/src/editaction.c @@ -1643,7 +1643,7 @@ void sethandles_action_keys (int code) static void clever_keyblock_names (Key *key, short *mval) { KeyBlock *kb; - int but=0, i, keynum; + int but=0, keynum; char str[64]; float x; @@ -1661,7 +1661,6 @@ static void clever_keyblock_names (Key *key, short *mval) if (kb == NULL) return; - if (kb->name[0] == '\0') sprintf(str, "Key %d", keynum); else |