diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-04-29 21:59:44 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-29 21:59:44 +0400 |
| commit | 4ca0df348efc93994f0ebb0827f8b6e38792c469 (patch) | |
| tree | 7697ded8e9e4cbe09a50e2327e825848650413d2 | |
| parent | f135246c01e7e59c6718c781bbecbdb6eec5bc8b (diff) | |
move modal view3d keymaps out of main list of keymaps into the view3d section.
| -rw-r--r-- | release/scripts/modules/bpy_extras/keyconfig_utils.py | 11 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py index 29a65965c3f..1baab5654c6 100644 --- a/release/scripts/modules/bpy_extras/keyconfig_utils.py +++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py @@ -60,6 +60,12 @@ KM_HIERARCHY = [ ('Object Non-modal', 'EMPTY', 'WINDOW', []), # mode change + ('View3D Fly Modal', 'EMPTY', 'WINDOW', []), + ('View3D Rotate Modal', 'EMPTY', 'WINDOW', []), + ('View3D Move Modal', 'EMPTY', 'WINDOW', []), + ('View3D Zoom Modal', 'EMPTY', 'WINDOW', []), + ('View3D Dolly Modal', 'EMPTY', 'WINDOW', []), + ('3D View Generic', 'VIEW_3D', 'WINDOW', []), # toolbar and properties ]), @@ -122,11 +128,6 @@ KM_HIERARCHY = [ ('Standard Modal Map', 'EMPTY', 'WINDOW', []), ('Transform Modal Map', 'EMPTY', 'WINDOW', []), - ('View3D Fly Modal', 'EMPTY', 'WINDOW', []), - ('View3D Rotate Modal', 'EMPTY', 'WINDOW', []), - ('View3D Move Modal', 'EMPTY', 'WINDOW', []), - ('View3D Zoom Modal', 'EMPTY', 'WINDOW', []), - ('View3D Dolly Modal', 'EMPTY', 'WINDOW', []), ] diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 1f871312dfc..c204554cc6c 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -4053,6 +4053,7 @@ static void gesture_circle_modal_keymap(wmKeyConfig *keyconf) {0, NULL, 0, NULL, NULL} }; + /* WARNING - name is incorrect, use for non-3d views */ wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "View3D Gesture Circle"); /* this function is called for each spacetype, only needs to add map once */ |