From 485ea4353f293317ce395a75663758092cb6f969 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 10 Dec 2014 15:26:41 +0100 Subject: Sequencer: nested scene strip support (like metas) This makes it possible to use scenes as a kind of multi-user meta-strip (with their own time). Currently this supports rendering & drawing nested strips, but no convenient way to tab-enter into a scene strip. --- release/scripts/startup/bl_ui/space_sequencer.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index eb4625d2dac..b08bff13967 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -827,11 +827,13 @@ class SEQUENCER_PT_scene(SequencerButtonsPanel, Panel): layout.template_ID(strip, "scene") scene = strip.scene + layout.prop(strip, "use_sequence") - layout.label(text="Camera Override") - layout.template_ID(strip, "scene_camera") + if not strip.use_sequence: + layout.label(text="Camera Override") + layout.template_ID(strip, "scene_camera") - layout.prop(strip, "use_grease_pencil", text="Show Grease Pencil") + layout.prop(strip, "use_grease_pencil", text="Show Grease Pencil") if scene: layout.prop(scene, "audio_volume", text="Audio Volume") -- cgit v1.2.3