diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-11-21 16:01:28 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-11-21 16:01:28 +0300 |
| commit | 455866ecf95262c81232f27e632b06a659b46be9 (patch) | |
| tree | 66b4831dc861ea5f67d3536d989d9414eaee18f4 /source/blender/editors | |
| parent | 3d4fff3bc219524aa84f6ec98820fda2d0f9eb15 (diff) | |
- added back Shift+Tab to toggle snap
- added curve tilt and shrink/fatten buttons into the toolbar
- fix typo in last commit for view3d snap header button
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/object/object_ops.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_header.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index 813d88f9aab..5dd2c5773dd 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -323,6 +323,10 @@ void ED_object_generic_keymap(struct wmKeyConfig *keyconf, struct wmKeyMap *keym { wmKeyMapItem *km; + /* snap */ + km = WM_keymap_add_item(keymap, "WM_OT_context_toggle", TABKEY, KM_PRESS, KM_SHIFT, 0); + RNA_string_set(km->ptr, "path", "scene.tool_settings.snap"); + /* used by mesh, curve & lattice only */ if(do_pet) { /* context ops */ @@ -339,6 +343,5 @@ void ED_object_generic_keymap(struct wmKeyConfig *keyconf, struct wmKeyMap *keym RNA_string_set(km->ptr, "value_1", "DISABLED"); RNA_string_set(km->ptr, "value_2", "CONNECTED"); } - } diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 4ad6fc85dce..11b5f1858c5 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -2185,7 +2185,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) if (ts->snap_flag & SCE_SNAP) { uiDefIconButBitS(block, TOG, SCE_SNAP, B_REDR, ICON_SNAP_GEO,xco,yco,XIC,YIC, &ts->snap_flag, 0, 0, 0, 0, "Snap with Ctrl during transform (Shift Tab)"); xco+= XIC; - if(v3d->modeselect = OB_MODE_OBJECT) { + if(v3d->modeselect == OB_MODE_OBJECT) { uiDefIconButBitS(block, TOG, SCE_SNAP_ROTATE, B_REDR, ICON_SNAP_NORMAL,xco,yco,XIC,YIC, &ts->snap_flag, 0, 0, 0, 0, "Align rotation with the snapping target"); xco+= XIC; } |