[Bf-blender-cvs] [da33a55] master: Fixes to make script_load_keymap test pass.

[Howard Trickey]

Commit: da33a557bcfbdc44d9503053bde47f235c97dc80
Author: Howard Trickey
Date:   Sat Feb 8 10:52:56 2014 -0500
https://developer.blender.org/rBda33a557bcfbdc44d9503053bde47f235c97dc80

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.

===================================================================

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

===================================================================

diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py
index d1ff583..99f41b0 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 7398126a..045df87 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 3a9c267..e49e135 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);