diff options
author | Matt Ebb <matt@mke3.net> | 2005-12-18 21:05:14 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2005-12-18 21:05:14 +0300 |
commit | c33831ac1632ac0a0e42e174035dd0d0ea15a087 (patch) | |
tree | cb53bba3d773d49360d9e45f219d333010373b75 /source | |
parent | 6f422a749ae8689d95cb8587f828553ef8811223 (diff) |
* Updates for missing menu items
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/include/BIF_editaction.h | 4 | ||||
-rw-r--r-- | source/blender/include/BIF_editconstraint.h | 1 | ||||
-rw-r--r-- | source/blender/src/editaction.c | 5 | ||||
-rw-r--r-- | source/blender/src/editconstraint.c | 36 | ||||
-rw-r--r-- | source/blender/src/editmesh.c | 2 | ||||
-rw-r--r-- | source/blender/src/header_action.c | 73 | ||||
-rw-r--r-- | source/blender/src/header_info.c | 8 | ||||
-rw-r--r-- | source/blender/src/header_nla.c | 8 | ||||
-rw-r--r-- | source/blender/src/header_view3d.c | 87 | ||||
-rw-r--r-- | source/blender/src/outliner.c | 1 |
10 files changed, 183 insertions, 42 deletions
diff --git a/source/blender/include/BIF_editaction.h b/source/blender/include/BIF_editaction.h index 74ffbca1b9b..7471e80baa9 100644 --- a/source/blender/include/BIF_editaction.h +++ b/source/blender/include/BIF_editaction.h @@ -78,6 +78,10 @@ void transform_meshchannel_keys(char mode, struct Key *key); struct Key *get_action_mesh_key(void); int get_nearest_key_num(struct Key *key, short *mval, float *x); void set_snap_actionchannels(void); +void up_sel_action(void); +void down_sel_action(void); +void top_sel_action(void); +void bottom_sel_action(void); /* Handles */ void sethandles_meshchannel_keys(int code, struct Key *key); diff --git a/source/blender/include/BIF_editconstraint.h b/source/blender/include/BIF_editconstraint.h index 2ab72a304c2..5db034f57de 100644 --- a/source/blender/include/BIF_editconstraint.h +++ b/source/blender/include/BIF_editconstraint.h @@ -51,6 +51,7 @@ struct bConstraintChannel *get_active_constraint_channel(struct Object *ob); void object_test_constraints(struct Object *owner); void add_constraint(int only_IK); +void ob_clear_constraints(void); char *get_con_subtarget_name(struct bConstraint *con, struct Object *target); diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c index 855ed9056b7..77e1c722246 100644 --- a/source/blender/src/editaction.c +++ b/source/blender/src/editaction.c @@ -102,11 +102,6 @@ extern int count_action_levels (bAction *act); /* Local Function prototypes, are forward needed */ static void hilight_channel (bAction *act, bActionChannel *chan, short hilight); -static void up_sel_action(void); -static void down_sel_action(void); -static void top_sel_action(void); -static void bottom_sel_action(void); - /* Implementation */ short showsliders = 0; diff --git a/source/blender/src/editconstraint.c b/source/blender/src/editconstraint.c index dfca6144e62..1705ad14acc 100644 --- a/source/blender/src/editconstraint.c +++ b/source/blender/src/editconstraint.c @@ -618,28 +618,28 @@ void add_constraint(int only_IK) } if(pchansel) - nr= pupmenu("Add IK Constraint%t|To Selected Bone%x10"); + nr= pupmenu("Add IK Constraint%t|To Active Bone%x10"); else if(obsel) - nr= pupmenu("Add IK Constraint%t|To Selected Object%x10"); + nr= pupmenu("Add IK Constraint%t|To Active Object%x10"); else nr= pupmenu("Add IK Constraint%t|To New Empty Object%x10|Without Target%x11"); } else { if(pchanact) { if(pchansel) - nr= pupmenu("Add Constraint to selected Bone%t|Copy Location%x1|Copy Rotation%x2|Track To%x3|Floor%x4|Locked Track%x5|Stretch To%x7"); + nr= pupmenu("Add Constraint to Active Bone%t|Copy Location%x1|Copy Rotation%x2|Track To%x3|Floor%x4|Locked Track%x5|Stretch To%x7"); else if(obsel && obsel->type==OB_CURVE) - nr= pupmenu("Add Constraint to selected Object%t|Copy Location%x1|Copy Rotation%x2|Track To%x3|Floor%x4|Locked Track%x5|Follow Path%x6|Stretch To%x7"); + nr= pupmenu("Add Constraint to Active Object%t|Copy Location%x1|Copy Rotation%x2|Track To%x3|Floor%x4|Locked Track%x5|Follow Path%x6|Stretch To%x7"); else if(obsel) - nr= pupmenu("Add Constraint to selected Object%t|Copy Location%x1|Copy Rotation%x2|Track To%x3|Floor%x4|Locked Track%x5|Stretch To%x7"); + nr= pupmenu("Add Constraint to Active Object%t|Copy Location%x1|Copy Rotation%x2|Track To%x3|Floor%x4|Locked Track%x5|Stretch To%x7"); else nr= pupmenu("Add Constraint to New Empty Object%t|Copy Location%x1|Copy Rotation%x2|Track To%x3|Floor%x4|Locked Track%x5|Stretch To%x7"); } else { if(obsel && obsel->type==OB_CURVE) - nr= pupmenu("Add Constraint to selected Object%t|Copy Location%x1|Copy Rotation%x2|Track To%x3|Floor%x4|Locked Track%x5|Follow Path%x6"); + nr= pupmenu("Add Constraint to Active Object%t|Copy Location%x1|Copy Rotation%x2|Track To%x3|Floor%x4|Locked Track%x5|Follow Path%x6"); else if(obsel) - nr= pupmenu("Add Constraint to selected Object%t|Copy Location%x1|Copy Rotation%x2|Track To%x3|Floor%x4|Locked Track%x5"); + nr= pupmenu("Add Constraint to Active Object%t|Copy Location%x1|Copy Rotation%x2|Track To%x3|Floor%x4|Locked Track%x5"); else nr= pupmenu("Add Constraint to New Empty Object%t|Copy Location%x1|Copy Rotation%x2|Track To%x3|Floor%x4|Locked Track%x5"); } @@ -758,4 +758,24 @@ void add_constraint(int only_IK) } - +void ob_clear_constraints(void) +{ + Object *ob= OBACT; + + /* paranoia checks */ + if(!ob) return; + if(ob==G.obedit || (ob->flag & OB_POSEMODE)) return; + + if(okee("Clear Constraints")==0) return; + + free_constraints(&ob->constraints); + + DAG_object_flush_update(G.scene, ob, OB_RECALC_OB); + + allqueue (REDRAWVIEW3D, 0); + allqueue (REDRAWBUTSOBJECT, 0); + allqueue (REDRAWOOPS, 0); + + BIF_undo_push("Clear Constraint(s)"); + +}
\ No newline at end of file diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c index 2eb59c146f2..669c182ef48 100644 --- a/source/blender/src/editmesh.c +++ b/source/blender/src/editmesh.c @@ -1223,7 +1223,7 @@ void separatemenu(void) if(G.editMesh->verts.first==NULL) return; - event = pupmenu("Separate (No undo!) %t|Selected%x1|All Loose Parts%x2"); + event = pupmenu("Separate %t|Selected%x1|All Loose Parts%x2"); if (event==0) return; waitcursor(1); diff --git a/source/blender/src/header_action.c b/source/blender/src/header_action.c index 608153e10b5..3ab573ff9ce 100644 --- a/source/blender/src/header_action.c +++ b/source/blender/src/header_action.c @@ -93,6 +93,11 @@ #define ACTMENU_KEY_BAKE 2 #define ACTMENU_KEY_SNAP 3 +#define ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_UP 0 +#define ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_DOWN 1 +#define ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_TOP 2 +#define ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_BOTTOM 3 + #define ACTMENU_KEY_TRANSFORM_MOVE 0 #define ACTMENU_KEY_TRANSFORM_SCALE 1 #define ACTMENU_KEY_TRANSFORM_SLIDE 2 @@ -669,6 +674,62 @@ static uiBlock *action_keymenu_extendmenu(void *arg_unused) return block; } +static void do_action_keymenu_chanposmenu(void *arg, int event) +{ + switch(event) + { + case ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_DOWN: + down_sel_action(); + break; + case ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_UP: + up_sel_action(); + break; + case ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_TOP: + top_sel_action(); + break; + case ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_BOTTOM: + bottom_sel_action(); + break; + } + + scrarea_queue_winredraw(curarea); +} + +static uiBlock *action_keymenu_chanposmenu(void *arg_unused) +{ + uiBlock *block; + short yco= 0, menuwidth=120; + + block= uiNewBlock(&curarea->uiblocks, "action_keymenu_chanposmenu", + UI_EMBOSSP, UI_HELV, G.curscreen->mainwin); + uiBlockSetButmFunc(block, do_action_keymenu_chanposmenu, NULL); + + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, + "Move Up|Page Up", 0, yco-=20, + menuwidth, 19, NULL, 0.0, 0.0, 0, + ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_UP, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, + "Move Down|Page Down", 0, yco-=20, + menuwidth, 19, NULL, 0.0, 0.0, 0, + ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_DOWN, ""); + + uiDefBut(block, SEPR, 0, "", 0, yco-=6, + menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); + + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, + "Move to Top|Shift Page Up", 0, yco-=20, + menuwidth, 19, NULL, 0.0, 0.0, 0, + ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_TOP, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, + "Move to Bottom|Shift Page Down", 0, yco-=20, + menuwidth, 19, NULL, 0.0, 0.0, 0, + ACTMENU_KEY_CHANPOS_MOVE_CHANNEL_BOTTOM, ""); + + uiBlockSetDirection(block, UI_RIGHT); + uiTextBoundsBlock(block, 60); + + return block; +} static void do_action_keymenu(void *arg, int event) { @@ -752,15 +813,23 @@ static uiBlock *action_keymenu(void *arg_unused) uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); + uiDefIconTextBlockBut(block, action_keymenu_handlemenu, + NULL, ICON_RIGHTARROW_THIN, + "Handle Type", 0, yco-=20, 120, 20, ""); + + uiDefBut(block, SEPR, 0, "", 0, yco-=6, + menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); + uiDefIconTextBlockBut(block, action_keymenu_extendmenu, NULL, ICON_RIGHTARROW_THIN, "Extend Mode", 0, yco-=20, 120, 20, ""); uiDefIconTextBlockBut(block, action_keymenu_intpolmenu, NULL, ICON_RIGHTARROW_THIN, "Interpolation Mode", 0, yco-=20, 120, 20, ""); - uiDefIconTextBlockBut(block, action_keymenu_handlemenu, + uiDefIconTextBlockBut(block, action_keymenu_chanposmenu, NULL, ICON_RIGHTARROW_THIN, - "Handle Type", 0, yco-=20, 120, 20, ""); + "Channel Ordering", 0, yco-=20, 120, 20, ""); + if(curarea->headertype==HEADERTOP) { uiBlockSetDirection(block, UI_DOWN); diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c index 01c1ddc194d..8e6c04c50aa 100644 --- a/source/blender/src/header_info.c +++ b/source/blender/src/header_info.c @@ -1204,10 +1204,6 @@ void do_info_addmenu(void *arg, int event) /* Camera */ add_object_draw(OB_CAMERA); break; - case 7: - /* Lamp */ - // add_object_draw(OB_LAMP); - break; case 8: /* Armature */ add_primitiveArmature(OB_ARMATURE); @@ -1242,13 +1238,11 @@ static uiBlock *info_addmenu(void *arg_unused) uiDefBut(block, SEPR, 0, "", 0, yco-=6, 120, 6, NULL, 0.0, 0.0, 0, 0, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Camera", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 6, ""); -// uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Lamp", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 7, ""); uiDefIconTextBlockBut(block, info_add_lampmenu, NULL, ICON_RIGHTARROW_THIN, "Lamp", 0, yco-=20, 120, 19, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, 120, 6, NULL, 0.0, 0.0, 0, 0, ""); - /* armature needs 3d window to draw */ - //uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Armature", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 8, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Armature", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 8, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Lattice", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 9, ""); uiBlockSetDirection(block, UI_DOWN); diff --git a/source/blender/src/header_nla.c b/source/blender/src/header_nla.c index 636334e2e9a..d193f382bba 100644 --- a/source/blender/src/header_nla.c +++ b/source/blender/src/header_nla.c @@ -289,8 +289,8 @@ static uiBlock *nla_stripmenu(void *arg_unused) uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Strip Properties...|N", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 0, ""); uiDefIconTextBlockBut(block, nla_strip_transformmenu, NULL, ICON_RIGHTARROW_THIN, "Transform", 0, yco-=20, 120, 20, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Reset Strip Size|ALT S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Reset Action Start/End|ALT S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 9, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Reset Strip Size|Alt S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Reset Action Start/End|Alt S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 9, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Snap to Frame|Shift S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 10, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); @@ -301,8 +301,8 @@ static uiBlock *nla_stripmenu(void *arg_unused) uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Move Up|Page Down", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 6, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Move Down|Page Up", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Move Down|Page Down", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Move Up|Page Up", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 6, ""); // uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Convert Action to NLA Strip|C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 5, ""); diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index 8a91a60067e..628fcd7af2c 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -1903,6 +1903,35 @@ static uiBlock *view3d_edit_object_trackmenu(void *arg_unused) return block; } +static void do_view3d_edit_object_constraintsmenu(void *arg, int event) +{ + switch(event) { + case 1: /* add constraint */ + add_constraint(0); + break; + case 2: /* clear constraint */ + ob_clear_constraints(); + break; + } + allqueue(REDRAWVIEW3D, 0); +} + +static uiBlock *view3d_edit_object_constraintsmenu(void *arg_unused) +{ + uiBlock *block; + short yco = 20, menuwidth = 120; + + block= uiNewBlock(&curarea->uiblocks, "view3d_edit_object_constraintsmenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin); + uiBlockSetButmFunc(block, do_view3d_edit_object_constraintsmenu, NULL); + + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add Constraint...|Ctrl Alt C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear Constraints", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, ""); + + uiBlockSetDirection(block, UI_RIGHT); + uiTextBoundsBlock(block, 60); + return block; +} + static void do_view3d_edit_object_scriptsmenu(void *arg, int event) { BPY_menu_do_python(PYMENU_OBJECT, event); @@ -2020,6 +2049,7 @@ static uiBlock *view3d_edit_objectmenu(void *arg_unused) uiDefIconTextBlockBut(block, view3d_edit_object_parentmenu, NULL, ICON_RIGHTARROW_THIN, "Parent", 0, yco-=20, 120, 19, ""); uiDefIconTextBlockBut(block, view3d_edit_object_trackmenu, NULL, ICON_RIGHTARROW_THIN, "Track", 0, yco-=20, 120, 19, ""); + uiDefIconTextBlockBut(block, view3d_edit_object_constraintsmenu, NULL, ICON_RIGHTARROW_THIN, "Constraints", 0, yco-=20, 120, 19, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); @@ -3118,6 +3148,35 @@ static uiBlock *view3d_edit_latticemenu(void *arg_unused) return block; } +void do_view3d_edit_armature_parentmenu(void *arg, int event) +{ + switch(event) { + case 1: + make_bone_parent(); + break; + case 2: + clear_bone_parent(); + break; + } + allqueue(REDRAWVIEW3D, 0); +} + +static uiBlock *view3d_edit_armature_parentmenu(void *arg_unused) +{ + uiBlock *block; + short yco = 20, menuwidth = 120; + + block= uiNewBlock(&curarea->uiblocks, "view3d_edit_armature_parentmenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin); + uiBlockSetButmFunc(block, do_view3d_edit_armature_parentmenu, NULL); + + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Make Parent...|Ctrl P", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear Parent...|Alt P", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, ""); + + uiBlockSetDirection(block, UI_RIGHT); + uiTextBoundsBlock(block, 60); + return block; +} + static void do_view3d_edit_armaturemenu(void *arg, int event) { switch(event) { @@ -3144,15 +3203,12 @@ static void do_view3d_edit_armaturemenu(void *arg, int event) case 7: /* Warp */ initTransform(TFM_WARP, CTX_NONE); Transform(); - case 8: - make_bone_parent(); - break; - case 9: - clear_bone_parent(); - break; case 10: /* forked! */ extrude_armature(1); break; + case 11: /* clear roll */ + auto_align_armature(); + break; } allqueue(REDRAWVIEW3D, 0); } @@ -3174,6 +3230,7 @@ static uiBlock *view3d_edit_armaturemenu(void *arg_unused) uiDefIconTextBlockBut(block, view3d_transformmenu, NULL, ICON_RIGHTARROW_THIN, "Transform", 0, yco-=20, 120, 19, ""); uiDefIconTextBlockBut(block, view3d_edit_mirrormenu, NULL, ICON_RIGHTARROW_THIN, "Mirror", 0, yco-=20, menuwidth, 19, ""); uiDefIconTextBlockBut(block, view3d_edit_snapmenu, NULL, ICON_RIGHTARROW_THIN, "Snap", 0, yco-=20, 120, 19, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear Bone Roll Angle|Ctrl N", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 11, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); @@ -3183,9 +3240,11 @@ static uiBlock *view3d_edit_armaturemenu(void *arg_unused) uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Duplicate|Shift D", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete|X", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Make Parent...|Ctrl P", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 8, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear Parent...|Alt P", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 9, ""); + uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); + + uiDefIconTextBlockBut(block, view3d_edit_armature_parentmenu, NULL, ICON_RIGHTARROW_THIN, "Parent", 0, yco-=20, 120, 19, ""); + if(curarea->headertype==HEADERTOP) { uiBlockSetDirection(block, UI_DOWN); } @@ -3417,7 +3476,7 @@ static uiBlock *view3d_pose_armaturemenu(void *arg_unused) uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, "Transform Properties|N", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, ""); uiDefIconTextBlockBut(block, view3d_transformmenu, NULL, ICON_RIGHTARROW_THIN, "Transform", 0, yco-=20, 120, 19, ""); uiDefIconTextBlockBut(block, view3d_pose_armature_transformmenu, NULL, ICON_RIGHTARROW_THIN, "Clear Transform", 0, yco-=20, 120, 19, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Scale Envelope Falloff|Alt S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 13, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Scale Envelope Distance|Alt S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 13, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); @@ -4289,18 +4348,18 @@ void view3d_buttons(void) /* Transform widget / manipulators */ uiBlockBeginAlign(block); - uiDefIconButBitS(block, TOG, V3D_USE_MANIPULATOR, B_REDR, ICON_MANIPUL,xco,0,XIC,YIC, &G.vd->twflag, 0, 0, 0, 0, "Use 3d transform manipulator (CTRL+Space)"); + uiDefIconButBitS(block, TOG, V3D_USE_MANIPULATOR, B_REDR, ICON_MANIPUL,xco,0,XIC,YIC, &G.vd->twflag, 0, 0, 0, 0, "Use 3d transform manipulator (Ctrl Space)"); xco+= XIC; if(G.vd->twflag & V3D_USE_MANIPULATOR) { - uiDefIconButBitS(block, TOG, V3D_MANIP_TRANSLATE, B_MAN_TRANS, ICON_MAN_TRANS, xco,0,XIC,YIC, &G.vd->twtype, 1.0, 0.0, 0, 0, "Translate manipulator mode (CTRL+Space)"); + uiDefIconButBitS(block, TOG, V3D_MANIP_TRANSLATE, B_MAN_TRANS, ICON_MAN_TRANS, xco,0,XIC,YIC, &G.vd->twtype, 1.0, 0.0, 0, 0, "Translate manipulator mode (Ctrl Alt G)"); xco+= XIC; - uiDefIconButBitS(block, TOG, V3D_MANIP_ROTATE, B_MAN_ROT, ICON_MAN_ROT, xco,0,XIC,YIC, &G.vd->twtype, 1.0, 0.0, 0, 0, "Rotate manipulator mode (CTRL+Space)"); + uiDefIconButBitS(block, TOG, V3D_MANIP_ROTATE, B_MAN_ROT, ICON_MAN_ROT, xco,0,XIC,YIC, &G.vd->twtype, 1.0, 0.0, 0, 0, "Rotate manipulator mode (Ctrl Alt R)"); xco+= XIC; - uiDefIconButBitS(block, TOG, V3D_MANIP_SCALE, B_MAN_SCALE, ICON_MAN_SCALE, xco,0,XIC,YIC, &G.vd->twtype, 1.0, 0.0, 0, 0, "Scale manipulator mode (CTRL+Space)"); + uiDefIconButBitS(block, TOG, V3D_MANIP_SCALE, B_MAN_SCALE, ICON_MAN_SCALE, xco,0,XIC,YIC, &G.vd->twtype, 1.0, 0.0, 0, 0, "Scale manipulator mode (Ctrl Alt S)"); xco+= XIC; } - uiDefButS(block, MENU, B_NOP, "Orientation%t|Global%x0|Local%x1|Normal%x2|View%x3",xco,0,70,YIC, &G.vd->twmode, 0, 0, 0, 0, "Transform Orientation (ALT+Space)"); + uiDefButS(block, MENU, B_NOP, "Orientation%t|Global%x0|Local%x1|Normal%x2|View%x3",xco,0,70,YIC, &G.vd->twmode, 0, 0, 0, 0, "Transform Orientation (Alt Space)"); xco+= 70; uiBlockEndAlign(block); xco+= 8; diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c index d7cc7bdc478..5ebf97d7ecc 100644 --- a/source/blender/src/outliner.c +++ b/source/blender/src/outliner.c @@ -2364,7 +2364,6 @@ static void outliner_draw_tree(SpaceOops *soops) outliner_draw_selection(soops, &soops->tree, &starty); // grey hierarchy lines - glColor3ub(110,110,110); BIF_ThemeColorBlend(TH_BACK, TH_TEXT, 0.5); starty= soops->v2d.tot.ymax-OL_H/2; startx= 6; |