[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24784] trunk/blender: Sequencer:
Thomas Dinges
dingto at gmx.de
Sun Nov 22 22:16:04 CET 2009
Revision: 24784
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24784
Author: dingto
Date: 2009-11-22 22:16:04 +0100 (Sun, 22 Nov 2009)
Log Message:
-----------
Sequencer:
* It's now possible to set the scene for a scene strip.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_sequencer.py
trunk/blender/source/blender/makesrna/intern/rna_sequence.c
Modified: trunk/blender/release/scripts/ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/ui/space_sequencer.py 2009-11-22 20:49:13 UTC (rev 24783)
+++ trunk/blender/release/scripts/ui/space_sequencer.py 2009-11-22 21:16:04 UTC (rev 24784)
@@ -501,7 +501,7 @@
if not strip:
return False
- return strip.type in ('SOUND', )
+ return strip.type in ('SOUND')
def draw(self, context):
layout = self.layout
@@ -522,8 +522,28 @@
row.itemR(strip.sound, "caching")
layout.itemR(strip, "volume")
+
+class SEQUENCER_PT_scene(SequencerButtonsPanel):
+ bl_label = "Scene"
+ def poll(self, context):
+ if context.space_data.display_mode != 'SEQUENCER':
+ return False
+ strip = act_strip(context)
+ if not strip:
+ return False
+
+ return strip.type in ('SCENE')
+
+ def draw(self, context):
+ layout = self.layout
+
+ strip = act_strip(context)
+
+ layout.template_ID(strip, "scene")
+
+
class SEQUENCER_PT_filter(SequencerButtonsPanel):
bl_label = "Filter"
@@ -628,6 +648,7 @@
bpy.types.register(SEQUENCER_PT_effect)
bpy.types.register(SEQUENCER_PT_input)
bpy.types.register(SEQUENCER_PT_sound)
+bpy.types.register(SEQUENCER_PT_scene)
bpy.types.register(SEQUENCER_PT_filter)
bpy.types.register(SEQUENCER_PT_proxy)
Modified: trunk/blender/source/blender/makesrna/intern/rna_sequence.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequence.c 2009-11-22 20:49:13 UTC (rev 24783)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequence.c 2009-11-22 21:16:04 UTC (rev 24784)
@@ -743,7 +743,9 @@
RNA_def_struct_sdna(srna, "Sequence");
prop= RNA_def_property(srna, "scene", PROP_POINTER, PROP_NONE);
+ RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Scene", "Scene that this sequence uses.");
+ RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, NULL);
rna_def_filter_video(srna);
rna_def_proxy(srna);
More information about the Bf-blender-cvs
mailing list