diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-13 09:04:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-13 09:04:57 +0300 |
| commit | 4503c96a175596bf5c0a52508a162dd78bcb9cdc (patch) | |
| tree | 63f3e490f52fa7001e83678127dbc128a7c80762 | |
| parent | aab959d71cba8dd223b8f2ccb10892d612fe8b75 (diff) | |
Cleanup: remove redundant checks
| -rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index affb5439af1..3fa27bd4d26 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1385,22 +1385,20 @@ class _defs_gpencil_edit: class _defs_gpencil_sculpt: def draw_settings_common(context, layout, tool): - ob = context.active_object - if ob and ob.mode == 'GPENCIL_SCULPT': - tool_settings = context.tool_settings - settings = tool_settings.gpencil_sculpt - tool = settings.sculpt_tool - brush = settings.brush + tool_settings = context.tool_settings + settings = tool_settings.gpencil_sculpt + tool = settings.sculpt_tool + brush = settings.brush - layout.prop(brush, "size", slider=True) + layout.prop(brush, "size", slider=True) - row = layout.row(align=True) - row.prop(brush, "strength", slider=True) - row.prop(brush, "use_pressure_strength", text="") + row = layout.row(align=True) + row.prop(brush, "strength", slider=True) + row.prop(brush, "use_pressure_strength", text="") - if tool in {'THICKNESS', 'STRENGTH', 'PINCH', 'TWIST'}: - row.separator() - row.prop(brush, "direction", expand=True, text="") + if tool in {'THICKNESS', 'STRENGTH', 'PINCH', 'TWIST'}: + row.separator() + row.prop(brush, "direction", expand=True, text="") @staticmethod def generate_from_brushes(context): @@ -1418,16 +1416,14 @@ class _defs_gpencil_sculpt: class _defs_gpencil_weight: def draw_settings_common(context, layout, tool): - ob = context.active_object - if ob and ob.mode == 'GPENCIL_WEIGHT': - settings = context.tool_settings.gpencil_sculpt - brush = settings.brush + settings = context.tool_settings.gpencil_sculpt + brush = settings.brush - layout.prop(brush, "size", slider=True) + layout.prop(brush, "size", slider=True) - row = layout.row(align=True) - row.prop(brush, "strength", slider=True) - row.prop(brush, "use_pressure_strength", text="") + row = layout.row(align=True) + row.prop(brush, "strength", slider=True) + row.prop(brush, "use_pressure_strength", text="") @staticmethod def generate_from_brushes(context): |