correct fix for [#25737] Console error message
authorCampbell Barton <ideasman42@gmail.com>
Thu, 20 Jan 2011 23:05:25 +0000 (23:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 20 Jan 2011 23:05:25 +0000 (23:05 +0000)
release/scripts/ui/space_sequencer.py
source/blender/makesrna/intern/rna_sequencer.c

index 3a9df992b57cce42491f0d44875872c0fcb4e9e4..110cb74d3c502879fde7697d517431797d8c07b5 100644 (file)
@@ -611,10 +611,11 @@ class SEQUENCER_PT_input(SequencerButtonsPanel, bpy.types.Panel):
             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):")
index a578354353e229310a3717499afc18bc5ce29478..233ffd06188ec6ee0896bf3ec0d9597261876da5 100644 (file)
@@ -1344,7 +1344,6 @@ static void rna_def_effect(BlenderRNA *brna)
 
        rna_def_filter_video(srna);
        rna_def_proxy(srna);
-       rna_def_input(srna); // XXX: why not? [#25737]
 }
 
 static void rna_def_multicam(BlenderRNA *brna)