Fixes to make script_load_keymap test pass.
authorHoward Trickey <howard.trickey@gmail.com>
Sat, 8 Feb 2014 15:52:56 +0000 (10:52 -0500)
committerHoward Trickey <howard.trickey@gmail.com>
Sat, 8 Feb 2014 15:52:56 +0000 (10:52 -0500)
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.

release/scripts/modules/bpy_extras/keyconfig_utils.py
source/blender/editors/space_script/script_ops.c
source/blender/editors/space_view3d/space_view3d.c

index d1ff583e75b36adecda7a7ace9e3ce01fa836031..99f41b0699c74c0a97c32c97ade6763825e61674 100644 (file)
@@ -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', []),
index 7398126a8e569d5e7f6f4adb989629e2156a1b39..045df87d8db565adfa54f98115af9641a0605be6 100644 (file)
@@ -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 */
 }
 
index 3a9c267f1cdc399f1e87dd350fca29a259753b5e..e49e135ec6e5d5fc6fd78998d088c51a8933efc8 100644 (file)
@@ -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);