diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2014-02-08 19:52:56 +0400 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2014-02-08 19:52:56 +0400 |
| commit | da33a557bcfbdc44d9503053bde47f235c97dc80 (patch) | |
| tree | 24182b8932f69947cd226192589d2399df26ef8e | |
| parent | 3276b83fda1e49bd007872c8dcd0f1b4c62063a3 (diff) | |
Fixes to make script_load_keymap test pass.
Removed Armature Sketch keymap, as the entries that were there
appear to have been moved to the Armature keymap.
Removed the Script keymap. The Script space is deprecated
and I could find no way that the keymap could be activated.
| -rw-r--r-- | release/scripts/modules/bpy_extras/keyconfig_utils.py | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_script/script_ops.c | 7 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 4 |
3 files changed, 2 insertions, 10 deletions
diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py index d1ff583e75b..99f41b0699c 100644 --- a/release/scripts/modules/bpy_extras/keyconfig_utils.py +++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py @@ -52,7 +52,6 @@ KM_HIERARCHY = [ ('Image Paint', 'EMPTY', 'WINDOW', []), # image and view3d ('Sculpt', 'EMPTY', 'WINDOW', []), - ('Armature Sketch', 'EMPTY', 'WINDOW', []), ('Particle', 'EMPTY', 'WINDOW', []), ('Knife Tool Modal Map', 'EMPTY', 'WINDOW', []), diff --git a/source/blender/editors/space_script/script_ops.c b/source/blender/editors/space_script/script_ops.c index 7398126a8e5..045df87d8db 100644 --- a/source/blender/editors/space_script/script_ops.c +++ b/source/blender/editors/space_script/script_ops.c @@ -59,11 +59,8 @@ void script_operatortypes(void) WM_operatortype_append(SCRIPT_OT_autoexec_warn_clear); } -void script_keymap(wmKeyConfig *keyconf) +void script_keymap(wmKeyConfig *UNUSED(keyconf)) { - wmKeyMap *keymap = WM_keymap_find(keyconf, "Script", SPACE_SCRIPT, 0); - - /* TODO - this is just while we have no way to load a text datablock */ - RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_python_file_run", PKEY, KM_PRESS, KM_CTRL | KM_SHIFT | KM_ALT, 0)->ptr, "filepath", "test.py"); + /* Script space is deprecated, and doesn't need a keymap */ } diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 3a9c267f1cd..e49e135ec6e 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -496,10 +496,6 @@ static void view3d_main_area_init(wmWindowManager *wm, ARegion *ar) keymap = WM_keymap_find(wm->defaultconf, "Lattice", 0, 0); WM_event_add_keymap_handler(&ar->handlers, keymap); - /* armature sketching needs to take over mouse */ - keymap = WM_keymap_find(wm->defaultconf, "Armature Sketch", 0, 0); - WM_event_add_keymap_handler(&ar->handlers, keymap); - keymap = WM_keymap_find(wm->defaultconf, "Particle", 0, 0); WM_event_add_keymap_handler(&ar->handlers, keymap); |