diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-20 02:44:13 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-20 02:44:13 +0300 |
commit | 53f4fc7da9d4b7acd613430bfd0f97536cc164de (patch) | |
tree | 6b483be08221611a5848da6993c109ebfad2e707 /release | |
parent | 310a1f728cf4ab3ca50f40c62e4ff4f4b280d62b (diff) |
Cleanup: style
Diffstat (limited to 'release')
12 files changed, 42 insertions, 23 deletions
diff --git a/release/scripts/startup/bl_ui/properties_animviz.py b/release/scripts/startup/bl_ui/properties_animviz.py index 54a1fb71a2b..10a3d1ddb91 100644 --- a/release/scripts/startup/bl_ui/properties_animviz.py +++ b/release/scripts/startup/bl_ui/properties_animviz.py @@ -48,7 +48,6 @@ class MotionPathButtonsPanel: else: row.operator("object.paths_range_update", text="", icon='TIME') - if mps.type == 'CURRENT_FRAME': col = layout.column(align=True) col.prop(mps, "frame_before", text="Frame Range Before") diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py index 4f639aa4bc9..2fa076c3794 100644 --- a/release/scripts/startup/bl_ui/properties_data_armature.py +++ b/release/scripts/startup/bl_ui/properties_data_armature.py @@ -21,6 +21,10 @@ import bpy from bpy.types import Panel, Menu from rna_prop_ui import PropertyPanel +from .properties_animviz import ( + MotionPathButtonsPanel, + MotionPathButtonsPanel_display, +) class ArmatureButtonsPanel: bl_space_type = 'PROPERTIES' @@ -257,12 +261,6 @@ class DATA_PT_iksolver_itasc(ArmatureButtonsPanel, Panel): col.prop(itasc, "damping_epsilon", text="Damping Epsilon", slider=True) -from .properties_animviz import ( - MotionPathButtonsPanel, - MotionPathButtonsPanel_display, -) - - class DATA_PT_motion_paths(MotionPathButtonsPanel, Panel): #bl_label = "Bones Motion Paths" bl_options = {'DEFAULT_CLOSED'} diff --git a/release/scripts/startup/bl_ui/properties_data_light.py b/release/scripts/startup/bl_ui/properties_data_light.py index acda015f8d4..3d78b3a664d 100644 --- a/release/scripts/startup/bl_ui/properties_data_light.py +++ b/release/scripts/startup/bl_ui/properties_data_light.py @@ -154,7 +154,10 @@ class DATA_PT_EEVEE_shadow(DataButtonsPanel, Panel): def poll(cls, context): light = context.light engine = context.engine - return (light and light.type in {'POINT', 'SUN', 'SPOT', 'AREA'}) and (engine in cls.COMPAT_ENGINES) + return ( + (light and light.type in {'POINT', 'SUN', 'SPOT', 'AREA'}) and + (engine in cls.COMPAT_ENGINES) + ) def draw_header(self, context): light = context.light @@ -219,7 +222,10 @@ class DATA_PT_EEVEE_shadow_contact(DataButtonsPanel, Panel): def poll(cls, context): light = context.light engine = context.engine - return (light and light.type in {'POINT', 'SUN', 'SPOT', 'AREA'}) and (engine in cls.COMPAT_ENGINES) + return ( + (light and light.type in {'POINT', 'SUN', 'SPOT', 'AREA'}) and + (engine in cls.COMPAT_ENGINES) + ) def draw_header(self, context): light = context.light @@ -303,7 +309,10 @@ class DATA_PT_falloff_curve(DataButtonsPanel, Panel): light = context.light engine = context.engine - return (light and light.type in {'POINT', 'SPOT'} and light.falloff_type == 'CUSTOM_CURVE') and (engine in cls.COMPAT_ENGINES) + return ( + (light and light.type in {'POINT', 'SPOT'} and light.falloff_type == 'CUSTOM_CURVE') and + (engine in cls.COMPAT_ENGINES) + ) def draw(self, context): light = context.light diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index 19795cd4da2..a4c109b150a 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -190,7 +190,15 @@ class VIEWLAYER_PT_freestyle_lineset(ViewLayerFreestyleEditorButtonsPanel, Panel row = layout.row() rows = 4 if lineset else 2 - row.template_list("VIEWLAYER_UL_linesets", "", freestyle, "linesets", freestyle.linesets, "active_index", rows=rows) + row.template_list( + "VIEWLAYER_UL_linesets", + "", + freestyle, + "linesets", + freestyle.linesets, + "active_index", + rows=rows, + ) sub = row.column(align=True) sub.operator("scene.freestyle_lineset_add", icon='ADD', text="") diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index 1994bfd34e8..5f2ac7e7123 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -786,6 +786,7 @@ class AnnotationOnionSkin: row.prop(gpl, "annotation_onion_after_color", text="") sub.prop(gpl, "annotation_onion_after_range", text="After") + class GreasePencilToolsPanel: # For use in "2D" Editors without their own toolbar # subclass must set diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index bace5acc67e..4b7098f1e0d 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -17,6 +17,10 @@ # ##### END GPL LICENSE BLOCK ##### # <pep8 compliant> +from .properties_animviz import ( + MotionPathButtonsPanel, + MotionPathButtonsPanel_display, +) import bpy from bpy.types import Panel, Menu from rna_prop_ui import PropertyPanel @@ -311,12 +315,6 @@ class OBJECT_PT_instancing(ObjectButtonsPanel, Panel): col.prop(ob, "show_instancer_for_render") -from .properties_animviz import ( - MotionPathButtonsPanel, - MotionPathButtonsPanel_display, -) - - class OBJECT_PT_instancing_size(ObjectButtonsPanel, Panel): bl_label = "Scale by Face Size" bl_parent_id = "OBJECT_PT_instancing" diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index 0664c407ab3..8271c948805 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -290,6 +290,7 @@ def brush_mask_texture_settings(layout, brush): # # Share between topbar and brush panel. + def brush_basic_wpaint_settings(layout, context, brush, *, compact=False): capabilities = brush.weight_paint_capabilities @@ -319,7 +320,6 @@ def brush_basic_vpaint_settings(layout, context, brush, *, compact=False): UnifiedPaintPanel.prop_unified_strength(row, context, brush, "strength") UnifiedPaintPanel.prop_unified_strength(row, context, brush, "use_pressure_strength", text="") - if capabilities.has_color: layout.prop(brush, "blend", text="" if compact else "Blend") diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index d21dc62ab06..95e76bd077c 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -1145,6 +1145,7 @@ class SEQUENCER_PT_filter(SequencerButtonsPanel, Panel): col.prop(strip, "color_multiply", text="Multiply") layout.prop(strip, "use_float", text="Convert to Float") + class SEQUENCER_PT_proxy_settings(SequencerButtonsPanel, Panel): bl_label = "Proxy settings" bl_category = "Proxy" diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 092494d783f..7bbf96a8175 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1839,8 +1839,8 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): _defs_weight_paint.gradient, None, ( - _defs_weight_paint.sample_weight, - _defs_weight_paint.sample_weight_group, + _defs_weight_paint.sample_weight, + _defs_weight_paint.sample_weight_group, ), None, lambda context: ( diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 621126eb4ec..a3e4d6c2565 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -1043,6 +1043,7 @@ class TOPBAR_PT_gpencil_primitive(Panel): # Curve layout.template_curve_mapping(settings, "thickness_primitive_curve", brush=True) + # Grease Pencil Fill class TOPBAR_PT_gpencil_fill(Panel): bl_space_type = 'VIEW_3D' diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 5b87dd0883a..fadc4f4b07b 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -286,6 +286,7 @@ class USERPREF_PT_edit_objects(Panel): def draw(self, context): pass + class USERPREF_PT_edit_objects_new(PreferencePanel, Panel): bl_label = "New Objects" bl_parent_id = "USERPREF_PT_edit_objects" @@ -383,6 +384,7 @@ class USERPREF_PT_edit_annotations(PreferencePanel, Panel): flow.prop(edit, "grease_pencil_eraser_radius", text="Eraser Radius") flow.prop(edit, "use_grease_pencil_simplify_stroke", text="Simplify Stroke") + class USERPREF_PT_edit_weight_paint(PreferencePanel, Panel): bl_label = "Weight Paint" bl_options = {'DEFAULT_CLOSED'} diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index a358233a5d0..61965b1b9b6 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -213,6 +213,7 @@ class View3DPaintPanel(UnifiedPaintPanel): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' + class VIEW3D_PT_tools_particlemode(Panel, View3DPaintPanel): bl_context = ".paint_common" # dot on purpose (access from topbar) bl_label = "Particle tools" @@ -233,7 +234,7 @@ class VIEW3D_PT_tools_particlemode(Panel, View3DPaintPanel): layout.use_property_split = True layout.use_property_decorate = False # No animation. - if tool != None: + if tool is not None: col = layout.column() col.prop(brush, "size", slider=True) if tool == 'ADD': @@ -300,8 +301,9 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): brush_basic_sculpt_settings(col, context, brush) # topology_rake_factor - if (capabilities.has_topology_rake and - context.sculpt_object.use_dynamic_topology_sculpting + if ( + capabilities.has_topology_rake and + context.sculpt_object.use_dynamic_topology_sculpting ): row = col.row() row.prop(brush, "topology_rake_factor", slider=True) |