[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28258] trunk/blender: Brought back secondary input filtering, thereby

[Peter Schlaile]

Revision: 28258
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28258
Author:   schlaile
Date:     2010-04-18 15:05:17 +0200 (Sun, 18 Apr 2010)

Log Message:
-----------
Brought back secondary input filtering, thereby
fixing 
[#21014] SEQUENCER: Can no longer apply colour balance filter to colour effect strip.

Also: reordered some UI elements so that
geometry, time and color modifications are grouped together.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_sequencer.py
    trunk/blender/source/blender/makesrna/intern/rna_sequencer.c

Modified: trunk/blender/release/scripts/ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/ui/space_sequencer.py	2010-04-18 12:19:07 UTC (rev 28257)
+++ trunk/blender/release/scripts/ui/space_sequencer.py	2010-04-18 13:05:17 UTC (rev 28258)
@@ -497,7 +497,11 @@
         if not strip:
             return False
 
-        return strip.type in ('MOVIE', 'IMAGE')
+        return strip.type in ('MOVIE', 'IMAGE', 'SCENE', 'META',
+                              'ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER',
+                              'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP',
+                              'PLUGIN',
+                              'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', 'SPEED')
 
     def draw_filename(self, context):
         pass
@@ -590,7 +594,22 @@
             col = split.column()
             col.prop(elem, "filename", text="") # strip.elements[0] could be a fallback
 
+class SEQUENCER_PT_input_secondary(SEQUENCER_PT_input):
+    bl_label = "Strip Input"
 
+    def poll(self, context):
+        if not self.has_sequencer(context):
+            return False
+
+        strip = act_strip(context)
+        if not strip:
+            return False
+
+        return strip.type in ('SCENE', 'META')
+
+    def draw_filename(self, context):
+        pass
+
 class SEQUENCER_PT_sound(SequencerButtonsPanel):
     bl_label = "Sound"
 
@@ -660,7 +679,11 @@
         if not strip:
             return False
 
-        return strip.type in ('MOVIE', 'IMAGE', 'SCENE', 'META')
+        return strip.type in ('MOVIE', 'IMAGE', 'SCENE', 'META',
+                              'ADD', 'SUBTRACT', 'ALPHA_OVER', 'ALPHA_UNDER',
+                              'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP',
+                              'PLUGIN',
+                              'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', 'SPEED')
 
     def draw(self, context):
         layout = self.layout
@@ -670,6 +693,14 @@
         col = layout.column()
         col.label(text="Video:")
         col.prop(strip, "strobe")
+
+        row = layout.row()
+        row.label(text="Flip:")
+        row.prop(strip, "flip_x", text="X")
+        row.prop(strip, "flip_y", text="Y")
+
+        col = layout.column()
+        col.prop(strip, "reverse_frames", text="Backwards")
         col.prop(strip, "de_interlace")
 
         col = layout.column()
@@ -678,12 +709,6 @@
         col.prop(strip, "premultiply")
         col.prop(strip, "convert_float")
 
-        col = layout.column()
-        col.label(text="Flip:")
-        col.prop(strip, "flip_x", text="X")
-        col.prop(strip, "flip_y", text="Y")
-        col.prop(strip, "reverse_frames", text="Backwards")
-
         layout.prop(strip, "use_color_balance")
         if strip.color_balance: # TODO - need to add this somehow
             row = layout.row()
@@ -766,6 +791,7 @@
     SEQUENCER_PT_effect,
     SEQUENCER_PT_input_movie,
     SEQUENCER_PT_input_image,
+    SEQUENCER_PT_input_secondary,
     SEQUENCER_PT_sound,
     SEQUENCER_PT_scene,
     SEQUENCER_PT_filter,

Modified: trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequencer.c	2010-04-18 12:19:07 UTC (rev 28257)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequencer.c	2010-04-18 13:05:17 UTC (rev 28258)
@@ -1028,6 +1028,7 @@
 	RNA_def_struct_ui_text(srna, "Effect Sequence", "Sequence strip applying an effect on the images created by other strips");
 	RNA_def_struct_sdna(srna, "Sequence");
 
+	rna_def_filter_video(srna);
 	rna_def_proxy(srna);
 }