diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-12-10 17:26:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-25 16:15:08 +0300 |
| commit | 485ea4353f293317ce395a75663758092cb6f969 (patch) | |
| tree | 164dc1aca9839b118b76e846ac428085591a507a /release | |
| parent | 456fdaba67e1ab3035ab916fc31b336d452ab99e (diff) | |
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.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 8 |
1 files changed, 5 insertions, 3 deletions
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") |