diff options
author | William Reynish <billrey@me.com> | 2019-06-21 21:01:08 +0300 |
---|---|---|
committer | William Reynish <billrey@me.com> | 2019-06-21 21:01:08 +0300 |
commit | 84040b86130d7678f73120c14c261c10b0e22854 (patch) | |
tree | 38ab58630b93bc475a700c8e0d99ab23d56c7d84 /release | |
parent | e60a01483ff048ef07fe7c148a5b8f33ed86d15d (diff) |
UI: Use enum for Sequencer vs 3D Camera input in Scene panel in Sequencer sidebar
Also move Time and Source below other panels for consistency
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 77eb48d7a0b..a5e8a44b47a 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -1217,6 +1217,7 @@ class SEQUENCER_PT_scene(SequencerButtonsPanel, Panel): def draw(self, context): layout = self.layout layout.use_property_split = True + layout.use_property_decorate = False strip = act_strip(context) @@ -1225,22 +1226,21 @@ class SEQUENCER_PT_scene(SequencerButtonsPanel, Panel): layout.template_ID(strip, "scene") scene = strip.scene - layout.prop(strip, "use_sequence") + layout.prop(strip, "scene_input") if scene: layout.prop(scene, "audio_volume", text="Volume") - if not strip.use_sequence: + if strip.scene_input == '3D_CAMERA': layout.alignment = 'RIGHT' sub = layout.column(align=True) split = sub.split(factor=0.5, align=True) split.alignment = 'RIGHT' - split.label(text="Camera Override") + split.label(text="Camera") split.template_ID(strip, "scene_camera") layout.prop(strip, "use_grease_pencil", text="Show Grease Pencil") - if not strip.use_sequence: if scene: # Warning, this is not a good convention to follow. # Expose here because setting the alpha from the 'Render' menu is very inconvenient. @@ -2018,13 +2018,13 @@ classes = ( SEQUENCER_PT_adjust_color, SEQUENCER_PT_adjust_sound, - SEQUENCER_PT_time, - SEQUENCER_PT_source, - SEQUENCER_PT_effect, SEQUENCER_PT_scene, SEQUENCER_PT_mask, + SEQUENCER_PT_time, + SEQUENCER_PT_source, + SEQUENCER_PT_modifiers, SEQUENCER_PT_cache_settings, |