[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34428] trunk/blender: correct fix for [ #25737] Console error message

[Campbell Barton]

Revision: 34428
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34428
Author:   campbellbarton
Date:     2011-01-20 23:05:25 +0000 (Thu, 20 Jan 2011)
Log Message:
-----------
correct fix for [#25737] Console error message

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	2011-01-20 22:22:16 UTC (rev 34427)
+++ trunk/blender/release/scripts/ui/space_sequencer.py	2011-01-20 23:05:25 UTC (rev 34428)
@@ -611,10 +611,11 @@
             col.prop(strip.crop, "min_y")
             col.prop(strip.crop, "max_x")
 
-        col = layout.column(align=True)
-        col.label(text="Trim Duration (hard):")
-        col.prop(strip, "animation_offset_start", text="Start")
-        col.prop(strip, "animation_offset_end", text="End")
+        if not isinstance(strip, bpy.types.EffectSequence):
+            col = layout.column(align=True)
+            col.label(text="Trim Duration (hard):")
+            col.prop(strip, "animation_offset_start", text="Start")
+            col.prop(strip, "animation_offset_end", text="End")
 
         col = layout.column(align=True)
         col.label(text="Trim Duration (soft):")

Modified: trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequencer.c	2011-01-20 22:22:16 UTC (rev 34427)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequencer.c	2011-01-20 23:05:25 UTC (rev 34428)
@@ -1344,7 +1344,6 @@
 
 	rna_def_filter_video(srna);
 	rna_def_proxy(srna);
-	rna_def_input(srna); // XXX: why not? [#25737]
 }
 
 static void rna_def_multicam(BlenderRNA *brna)