diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-08-06 01:58:57 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-06 01:58:57 +0400 |
commit | 4f71435bbf273d9508bd0980bda53469cb26dad0 (patch) | |
tree | 9fa7c9205d4f2aa8ff1d0e810cc87849d30b904f | |
parent | 163f6055d26383b7fa11df00da09ef63efb8cb6c (diff) |
some fixes for the poll() function from last commit.
Martin: forgot to mention, had to remove the use of super() in poll functions for netrender. commented with FIXME.
-rw-r--r-- | release/scripts/ui/space_sequencer.py | 26 | ||||
-rw-r--r-- | release/scripts/ui/space_view3d.py | 6 |
2 files changed, 17 insertions, 15 deletions
diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index bad731f61bf..df373526584 100644 --- a/release/scripts/ui/space_sequencer.py +++ b/release/scripts/ui/space_sequencer.py @@ -316,24 +316,26 @@ class SequencerButtonsPanel(): bl_space_type = 'SEQUENCE_EDITOR' bl_region_type = 'UI' - def has_sequencer(self, context): + @staticmethod + def has_sequencer(context): return (context.space_data.view_type == 'SEQUENCER') or (context.space_data.view_type == 'SEQUENCER_PREVIEW') @staticmethod def poll(context): - return self.has_sequencer(context) and (act_strip(context) is not None) + return __class__.has_sequencer(context) and (act_strip(context) is not None) class SequencerButtonsPanel_Output(): bl_space_type = 'SEQUENCE_EDITOR' bl_region_type = 'UI' - def has_preview(self, context): + @staticmethod + def has_preview(context): return (context.space_data.view_type == 'PREVIEW') or (context.space_data.view_type == 'SEQUENCER_PREVIEW') @staticmethod def poll(context): - return self.has_preview(context) + return __class__.has_preview(context) class SEQUENCER_PT_edit(SequencerButtonsPanel, bpy.types.Panel): @@ -388,7 +390,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, bpy.types.Panel): @staticmethod def poll(context): - if not self.has_sequencer(context): + if not __class__.has_sequencer(context): return False strip = act_strip(context) @@ -518,7 +520,7 @@ class SEQUENCER_PT_input(SequencerButtonsPanel, bpy.types.Panel): @staticmethod def poll(context): - if not self.has_sequencer(context): + if not __class__.has_sequencer(context): return False strip = act_strip(context) @@ -584,8 +586,8 @@ class SEQUENCER_PT_input(SequencerButtonsPanel, bpy.types.Panel): col = layout.column(align=True) col.label(text="Trim Duration:") - col.prop(strip, "animation_start_offset", text="Start") - col.prop(strip, "animation_end_offset", text="End") + col.prop(strip, "frame_offset_start", text="Start") + col.prop(strip, "frame_offset_end", text="End") class SEQUENCER_PT_sound(SequencerButtonsPanel, bpy.types.Panel): @@ -593,7 +595,7 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel, bpy.types.Panel): @staticmethod def poll(context): - if not self.has_sequencer(context): + if not __class__.has_sequencer(context): return False strip = act_strip(context) @@ -634,7 +636,7 @@ class SEQUENCER_PT_scene(SequencerButtonsPanel, bpy.types.Panel): @staticmethod def poll(context): - if not self.has_sequencer(context): + if not __class__.has_sequencer(context): return False strip = act_strip(context) @@ -659,7 +661,7 @@ class SEQUENCER_PT_filter(SequencerButtonsPanel, bpy.types.Panel): @staticmethod def poll(context): - if not self.has_sequencer(context): + if not __class__.has_sequencer(context): return False strip = act_strip(context) @@ -721,7 +723,7 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, bpy.types.Panel): @staticmethod def poll(context): - if not self.has_sequencer(context): + if not __class__.has_sequencer(context): return False strip = act_strip(context) diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index e89604de1dd..47788a48ba4 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -2253,7 +2253,7 @@ class VIEW3D_PT_context_properties(bpy.types.Panel): bl_label = "Properties" bl_default_closed = True - def _active_context_member(self, context): + def _active_context_member(context): obj = context.object if obj: mode = obj.mode @@ -2268,7 +2268,7 @@ class VIEW3D_PT_context_properties(bpy.types.Panel): @staticmethod def poll(context): - member = self._active_context_member(context) + member = __class__._active_context_member(context) if member: context_member = getattr(context, member) return context_member and context_member.keys() @@ -2278,7 +2278,7 @@ class VIEW3D_PT_context_properties(bpy.types.Panel): def draw(self, context): import rna_prop_ui # reload(rna_prop_ui) - member = self._active_context_member(context) + member = __class__._active_context_member(context) if member: # Draw with no edit button |