color strip was showing image crop and and offset twice, also made 'Make Metastrip...
authorCampbell Barton <ideasman42@gmail.com>
Wed, 28 Sep 2011 08:03:02 +0000 (08:03 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 28 Sep 2011 08:03:02 +0000 (08:03 +0000)
release/scripts/startup/bl_ui/space_sequencer.py
source/blender/editors/space_sequencer/sequencer_ops.c

index cabd835..5d830b2 100644 (file)
@@ -407,7 +407,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
         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):
index 5c13b57..ecc8fe7 100644 (file)
@@ -165,7 +165,7 @@ void sequencer_keymap(wmKeyConfig *keyconf)
 
        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);