From 70bca0405dbb45d34db9c4bdcc407a42832da002 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 28 Jul 2010 07:52:05 +0000 Subject: [PATCH] sequencer ui - opacity seq button was messed up. - only show opengl preview option in preview window. --- release/scripts/ui/space_sequencer.py | 51 +++++++++++++-------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index ba17b13775a..74de55b317a 100644 --- a/release/scripts/ui/space_sequencer.py +++ b/release/scripts/ui/space_sequencer.py @@ -357,7 +357,6 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel): sub = row.row() sub.active = (not strip.mute) sub.prop(strip, "blend_opacity", text="Opacity", slider=True) - sub = row.row() row.prop(strip, "mute", toggle=True, icon='RESTRICT_VIEW_ON' if strip.mute else 'RESTRICT_VIEW_OFF', text="") row.prop(strip, "lock", toggle=True, icon='LOCKED' if strip.lock else 'UNLOCKED', text="") @@ -379,30 +378,6 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel): col.label(text="Frame Still %d:%d" % (strip.frame_still_start, strip.frame_still_end)) -class SEQUENCER_PT_preview(bpy.types.Panel): - bl_label = "Scene Preview/Render" - bl_space_type = 'SEQUENCE_EDITOR' - bl_region_type = 'UI' - - def draw(self, context): - layout = self.layout - render = context.scene.render - - col = layout.column() - col.prop(render, "use_sequencer_gl_preview", text="Open GL Preview") - col = layout.column() - col.active = render.use_sequencer_gl_preview - col.prop(render, "sequencer_gl_preview", text="") - - ''' - col = layout.column() - col.prop(render, "use_sequencer_gl_render", text="Open GL Render") - col = layout.column() - col.active = render.use_sequencer_gl_render - col.prop(render, "sequencer_gl_render", text="") - ''' - - class SEQUENCER_PT_effect(SequencerButtonsPanel): bl_label = "Effect Strip" @@ -816,6 +791,30 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel): flow.prop(strip.proxy, "filepath") +class SEQUENCER_PT_preview(SequencerButtonsPanel_Output): + bl_label = "Scene Preview/Render" + bl_space_type = 'SEQUENCE_EDITOR' + bl_region_type = 'UI' + + def draw(self, context): + layout = self.layout + render = context.scene.render + + col = layout.column() + col.prop(render, "use_sequencer_gl_preview", text="Open GL Preview") + col = layout.column() + col.active = render.use_sequencer_gl_preview + col.prop(render, "sequencer_gl_preview", text="") + + ''' + col = layout.column() + col.prop(render, "use_sequencer_gl_render", text="Open GL Render") + col = layout.column() + col.active = render.use_sequencer_gl_render + col.prop(render, "sequencer_gl_render", text="") + ''' + + class SEQUENCER_PT_view(SequencerButtonsPanel_Output): bl_label = "View Settings" @@ -843,7 +842,6 @@ classes = [ SEQUENCER_MT_strip, SEQUENCER_PT_edit, # sequencer panels - SEQUENCER_PT_preview, SEQUENCER_PT_effect, SEQUENCER_PT_input_movie, SEQUENCER_PT_input_image, @@ -853,6 +851,7 @@ classes = [ SEQUENCER_PT_filter, SEQUENCER_PT_proxy, + SEQUENCER_PT_preview, SEQUENCER_PT_view] # view panels