[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40645] trunk/blender: color strip was showing image crop and and offset twice, also made ' Make Metastrip' key shortcut Ctrl+G ( so shift+G can be used for select group like object mode)

[Campbell Barton]

Revision: 40645
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40645
Author:   campbellbarton
Date:     2011-09-28 08:03:02 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
color strip was showing image crop and and offset twice, also made 'Make Metastrip' key shortcut Ctrl+G (so shift+G can be used for select group like object mode)

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
    trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py	2011-09-28 07:34:48 UTC (rev 40644)
+++ trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py	2011-09-28 08:03:02 UTC (rev 40645)
@@ -407,7 +407,7 @@
         return strip.type in {'ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER',
                               'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP',
                               'PLUGIN',
-                              'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', 'SPEED',
+                              'WIPE', 'GLOW', 'TRANSFORM', 'SPEED',
                               'MULTICAM', 'ADJUSTMENT'}
 
     def draw(self, context):

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c	2011-09-28 07:34:48 UTC (rev 40644)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c	2011-09-28 08:03:02 UTC (rev 40645)
@@ -165,7 +165,7 @@
 
 	WM_keymap_add_item(keymap, "SEQUENCER_OT_meta_toggle", TABKEY, KM_PRESS, 0, 0);
 
-	WM_keymap_add_item(keymap, "SEQUENCER_OT_meta_make", GKEY, KM_PRESS, KM_SHIFT, 0);
+	WM_keymap_add_item(keymap, "SEQUENCER_OT_meta_make", GKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "SEQUENCER_OT_meta_separate", GKEY, KM_PRESS, KM_ALT, 0);
 
 	WM_keymap_add_item(keymap, "SEQUENCER_OT_view_all", HOMEKEY, KM_PRESS, 0, 0);