From 616eb6818fdcf074eae31daa47c2ed581638b672 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 13 Feb 2015 16:09:24 +1100 Subject: cleanup --- .../scripts/modules/bl_i18n_utils/bl_extract_messages.py | 6 +++--- release/scripts/modules/bpy_extras/keyconfig_utils.py | 2 +- release/scripts/startup/bl_operators/clip.py | 4 ++-- release/scripts/startup/bl_ui/space_filebrowser.py | 1 - release/scripts/startup/bl_ui/space_sequencer.py | 14 +++++++------- release/scripts/startup/bl_ui/space_view3d.py | 4 ++-- release/scripts/startup/bl_ui/space_view3d_toolbar.py | 2 +- 7 files changed, 16 insertions(+), 17 deletions(-) (limited to 'release') diff --git a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py index d434c6a79cd..c3b2ae9908b 100644 --- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py +++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py @@ -258,7 +258,7 @@ def dump_rna_messages(msgs, reports, settings, verbose=False): bpy.types.Panel.__subclasses__() + bpy.types.Menu.__subclasses__() + bpy.types.UIList.__subclasses__() - if cls.__name__ not in _rna_clss_ids} + if cls.__name__ not in _rna_clss_ids} # Collect internal operators # extend with all internal operators @@ -266,8 +266,8 @@ def dump_rna_messages(msgs, reports, settings, verbose=False): # XXX Do not skip INTERNAL's anymore, some of those ops show up in UI now! # all possible operator names #op_ids = (set(cls.bl_rna.identifier for cls in bpy.types.OperatorProperties.__subclasses__()) | - #set(cls.bl_rna.identifier for cls in bpy.types.Operator.__subclasses__()) | - #set(cls.bl_rna.identifier for cls in bpy.types.OperatorMacro.__subclasses__())) + # set(cls.bl_rna.identifier for cls in bpy.types.Operator.__subclasses__()) | + # set(cls.bl_rna.identifier for cls in bpy.types.OperatorMacro.__subclasses__())) #get_instance = __import__("_bpy").ops.get_instance #path_resolve = type(bpy.context).__base__.path_resolve diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py index abc613bfa14..7e4c9e885e7 100644 --- a/release/scripts/modules/bpy_extras/keyconfig_utils.py +++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py @@ -33,7 +33,7 @@ KM_HIERARCHY = [ ('View2D Buttons List', 'EMPTY', 'WINDOW', []), # view 2d with buttons navigation ('Header', 'EMPTY', 'WINDOW', []), # header stuff (per region) - ('Grease Pencil', 'EMPTY', 'WINDOW', [ # grease pencil stuff (per region) + ('Grease Pencil', 'EMPTY', 'WINDOW', [ # grease pencil stuff (per region) ('Grease Pencil Stroke Edit Mode', 'EMPTY', 'WINDOW', []), ]), diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py index 99819166adc..5ce09b30d1f 100644 --- a/release/scripts/startup/bl_operators/clip.py +++ b/release/scripts/startup/bl_operators/clip.py @@ -162,8 +162,8 @@ class CLIP_OT_filter_tracks(bpy.types.Operator): # Find tracks with markers in both this frame and the previous one. relevant_tracks = [ track for track in clip.tracking.tracks - if track.markers.find_frame(frame) and - track.markers.find_frame(frame - 1)] + if (track.markers.find_frame(frame) and + track.markers.find_frame(frame - 1))] if not relevant_tracks: continue diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index ded307e8680..bdd8a107197 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -81,7 +81,6 @@ class FILEBROWSER_HT_header(Header): row.prop(params, "filter_search", text="", icon='VIEWZOOM') - class FILEBROWSER_UL_dir(bpy.types.UIList): def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index): direntry = item diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 834973a9a36..0be1bf0b90a 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -928,19 +928,19 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel): enabled = "" row = layout.row() if (strip.proxy.build_25): - enabled += "25% " + enabled += "25% " if (strip.proxy.build_50): - enabled += "50% " + enabled += "50% " if (strip.proxy.build_75): - enabled += "75% " + enabled += "75% " if (strip.proxy.build_100): - enabled += "100% " + enabled += "100% " row.label(enabled) if (strip.proxy.use_overwrite): - layout.label("Overwrite On") + layout.label("Overwrite On") else: - layout.label("Overwrite Off") + layout.label("Overwrite Off") col = layout.column() col.label(text="Build JPEG quality") @@ -953,7 +953,7 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel): col.prop(strip.proxy, "timecode") col = layout.column() - col.operator("sequencer.enable_proxies") + col.operator("sequencer.enable_proxies") col.operator("sequencer.rebuild_proxy") diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index b5bd13781f7..845e568d106 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3206,8 +3206,8 @@ class VIEW3D_PT_background_image(Panel): row = box.row() if bg.view_axis != 'CAMERA': - row.prop(bg, "rotation") - row.prop(bg, "size") + row.prop(bg, "rotation") + row.prop(bg, "size") class VIEW3D_PT_transform_orientations(Panel): diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index c0baeafe5fc..3646d214bde 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1724,7 +1724,7 @@ class VIEW3D_PT_tools_projectpaint(View3DPaintPanel, Panel): layout.prop(ipaint, "use_cavity") if ipaint.use_cavity: layout.template_curve_mapping(ipaint, "cavity_curve", brush=True) - + layout.prop(ipaint, "seam_bleed") layout.prop(ipaint, "dither") self.unified_paint_settings(layout, context) -- cgit v1.2.3