[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40602] branches/soc-2011-tomato: Camera tracking integration

[Sergey Sharybin]

Revision: 40602
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40602
Author:   nazgul
Date:     2011-09-27 10:04:29 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
Camera tracking integration
===========================

Small clean-up of keymap hierarchy: move global clip hotkeys
inside Clip keymaps in user preferences.

Modified Paths:
--------------
    branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py
    branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c

Modified: branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py	2011-09-27 10:03:26 UTC (rev 40601)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py	2011-09-27 10:04:29 UTC (rev 40602)
@@ -92,8 +92,9 @@
     ('Script', 'SCRIPTS_WINDOW', 'WINDOW', []),
     ('Text', 'TEXT_EDITOR', 'WINDOW', []),
     ('Console', 'CONSOLE', 'WINDOW', []),
-    ('Clip Editor', 'CLIP_EDITOR', 'WINDOW', []),
-    ('Clip Globals', 'CLIP_EDITOR', 'WINDOW', []),
+    ('Clip', 'CLIP_EDITOR', 'WINDOW', [
+        ('Clip Editor', 'CLIP_EDITOR', 'WINDOW', []),
+        ]),
 
     ('View3D Gesture Circle', 'EMPTY', 'WINDOW', []),
     ('Gesture Border', 'EMPTY', 'WINDOW', []),

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c	2011-09-27 10:03:26 UTC (rev 40601)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c	2011-09-27 10:04:29 UTC (rev 40602)
@@ -319,7 +319,7 @@
 
 	/* ******** Global hotkeys avalaible for all regions ******** */
 
-	keymap= WM_keymap_find(keyconf, "Clip Globals", SPACE_CLIP, 0);
+	keymap= WM_keymap_find(keyconf, "Clip", SPACE_CLIP, 0);
 
 	WM_keymap_add_item(keymap, "CLIP_OT_open", OKEY, KM_PRESS, KM_ALT, 0);
 
@@ -533,7 +533,7 @@
 	UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_STANDARD, ar->winx, ar->winy);
 
 	/* own keymap */
-	keymap= WM_keymap_find(wm->defaultconf, "Clip Globals", SPACE_CLIP, 0);
+	keymap= WM_keymap_find(wm->defaultconf, "Clip", SPACE_CLIP, 0);
 	WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
 
 	keymap= WM_keymap_find(wm->defaultconf, "Clip Editor", SPACE_CLIP, 0);
@@ -655,7 +655,7 @@
 
 	ED_region_panels_init(wm, ar);
 
-	keymap= WM_keymap_find(wm->defaultconf, "Clip Globals", SPACE_CLIP, 0);
+	keymap= WM_keymap_find(wm->defaultconf, "Clip", SPACE_CLIP, 0);
 	WM_event_add_keymap_handler(&ar->handlers, keymap);
 }