[Bf-blender-cvs] [0e4829eb058] master: Cleanup: rename SequenceEditor instance to 'ed'
Campbell Barton
noreply at git.blender.org
Mon Feb 19 12:33:26 CET 2018
Commit: 0e4829eb058d065a225f8a90e8292fcde1dbfbc9
Author: Campbell Barton
Date: Mon Feb 19 22:32:41 2018 +1100
Branches: master
https://developer.blender.org/rB0e4829eb058d065a225f8a90e8292fcde1dbfbc9
Cleanup: rename SequenceEditor instance to 'ed'
Name 'sequencer' & 'sequence' are too similar.
===================================================================
M release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 94924106542..918ce0da32f 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -106,7 +106,7 @@ class SEQUENCER_HT_header(Header):
layout.prop(st, "preview_channels", expand=True, text="")
layout.prop(st, "display_channel", text="Channel")
- ed = context.scene.sequence_editor
+ ed = scene.sequence_editor
if ed:
row = layout.row(align=True)
row.prop(ed, "show_overlay", text="", icon='GHOST_ENABLED')
@@ -1076,7 +1076,7 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel):
def draw(self, context):
layout = self.layout
- sequencer = context.scene.sequence_editor
+ ed = context.scene.sequence_editor
strip = act_strip(context)
@@ -1084,9 +1084,9 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel):
proxy = strip.proxy
flow = layout.column_flow()
- flow.prop(sequencer, "proxy_storage", text="Storage")
- if sequencer.proxy_storage == 'PROJECT':
- flow.prop(sequencer, "proxy_dir", text="Directory")
+ flow.prop(ed, "proxy_storage", text="Storage")
+ if ed.proxy_storage == 'PROJECT':
+ flow.prop(ed, "proxy_dir", text="Directory")
else:
flow.prop(proxy, "use_proxy_custom_directory")
flow.prop(proxy, "use_proxy_custom_file")
@@ -1192,7 +1192,7 @@ class SEQUENCER_PT_modifiers(SequencerButtonsPanel, Panel):
layout = self.layout
strip = act_strip(context)
- sequencer = context.scene.sequence_editor
+ ed = context.scene.sequence_editor
layout.prop(strip, "use_linear_modifiers")
@@ -1223,9 +1223,9 @@ class SEQUENCER_PT_modifiers(SequencerButtonsPanel, Panel):
row.prop(mod, "input_mask_type", expand=True)
if mod.input_mask_type == 'STRIP':
- sequences_object = sequencer
- if sequencer.meta_stack:
- sequences_object = sequencer.meta_stack[-1]
+ sequences_object = ed
+ if ed.meta_stack:
+ sequences_object = ed.meta_stack[-1]
box.prop_search(mod, "input_mask_strip", sequences_object, "sequences", text="Mask")
else:
box.prop(mod, "input_mask_id")
More information about the Bf-blender-cvs
mailing list