Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-01-21 02:05:25 +0300
committerCampbell Barton <ideasman42@gmail.com>2011-01-21 02:05:25 +0300
commitdf6bb34c2b881b5761ebe1470e4633505db92ee6 (patch)
tree07cbd2809c813636f25a5952cbf224372616307d
parent76940e6f5c0739af246cb7fd511814567a41fed6 (diff)
correct fix for [#25737] Console error message
-rw-r--r--release/scripts/ui/space_sequencer.py9
-rw-r--r--source/blender/makesrna/intern/rna_sequencer.c1
2 files changed, 5 insertions, 5 deletions
diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py
index 3a9df992b57..110cb74d3c5 100644
--- a/release/scripts/ui/space_sequencer.py
+++ b/release/scripts/ui/space_sequencer.py
@@ -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):")
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index a578354353e..233ffd06188 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -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)