[Bf-blender-cvs] [d212fb774f2] master: Cleanup: add back comment that was removed when moving code
Campbell Barton
noreply at git.blender.org
Wed Oct 23 15:43:45 CEST 2019
Commit: d212fb774f2f7bc6be76187ec82133f7cebcd054
Author: Campbell Barton
Date: Thu Oct 24 00:41:45 2019 +1100
Branches: master
https://developer.blender.org/rBd212fb774f2f7bc6be76187ec82133f7cebcd054
Cleanup: add back comment that was removed when moving code
Keep comments when moving code between files.
Also wrap lines over 120 width.
===================================================================
M release/scripts/startup/bl_ui/properties_paint_common.py
M release/scripts/startup/bl_ui/space_view3d.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 5f9e0fd9fe2..636c7f42f65 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -418,7 +418,15 @@ def brush_basic_gpencil_paint_settings(layout, _context, brush, tool, *, compact
row.prop(gp_settings, "pen_strength", slider=True)
row.prop(gp_settings, "use_strength_pressure", text="", icon='STYLUS_PRESSURE')
- if tool.idname in {"builtin.arc", "builtin.curve", "builtin.line", "builtin.box", "builtin.circle", "builtin.polyline"}:
+ # FIXME: tools must use their own UI drawing!
+ if tool.idname in {
+ "builtin.arc",
+ "builtin.curve",
+ "builtin.line",
+ "builtin.box",
+ "builtin.circle",
+ "builtin.polyline",
+ }:
settings = _context.tool_settings.gpencil_sculpt
if is_toolbar:
row = layout.row(align=True)
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 3ce9cb21b4d..5e9ad168a3e 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -298,7 +298,14 @@ class _draw_tool_settings_context_mode:
# is_paint = True
# FIXME: tools must use their own UI drawing!
- if tool.idname in {"builtin.line", "builtin.box", "builtin.circle", "builtin.arc", "builtin.curve","builtin.polyline"}:
+ if tool.idname in {
+ "builtin.line",
+ "builtin.box",
+ "builtin.circle",
+ "builtin.arc",
+ "builtin.curve",
+ "builtin.polyline",
+ }:
# is_paint = False
pass
elif tool.idname == "Cutter":
More information about the Bf-blender-cvs
mailing list