[Bf-blender-cvs] [a09cc3ee1a9] greasepencil-object: GPencil: Cleanup pep8
Antonio Vazquez
noreply at git.blender.org
Wed Nov 27 10:49:48 CET 2019
Commit: a09cc3ee1a99f2cd5040bbf30c8ab8c588bb2bb1
Author: Antonio Vazquez
Date: Wed Nov 27 10:18:04 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBa09cc3ee1a99f2cd5040bbf30c8ab8c588bb2bb1
GPencil: Cleanup pep8
===================================================================
M release/scripts/startup/bl_ui/properties_data_gpencil.py
M release/scripts/startup/bl_ui/properties_data_modifier.py
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M release/scripts/startup/bl_ui/properties_material_gpencil.py
M release/scripts/startup/bl_ui/properties_paint_common.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M release/scripts/startup/bl_ui/space_topbar.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index 9fd60495f56..5e7fc368fbc 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -21,6 +21,7 @@ import bpy
from bpy.types import Menu, Panel, UIList
from rna_prop_ui import PropertyPanel
+
###############################
# Base-Classes (for shared stuff - e.g. poll, attributes, etc.)
@@ -110,7 +111,7 @@ class DATA_PT_gpencil_layers(DataButtonsPanel, Panel):
def draw(self, context):
layout = self.layout
- #layout.use_property_split = True
+ # layout.use_property_split = True
layout.use_property_decorate = False
gpd = context.gpencil
@@ -160,7 +161,6 @@ class DATA_PT_gpencil_layers(DataButtonsPanel, Panel):
col = layout.column(align=True)
if gpl:
-
layout = self.layout
layout.use_property_split = True
layout.use_property_decorate = True
@@ -469,6 +469,7 @@ class DATA_PT_custom_props_gpencil(DataButtonsPanel, PropertyPanel, Panel):
_context_path = "object.data"
_property_type = bpy.types.GreasePencil
+
###############################
@@ -495,5 +496,6 @@ classes = (
if __name__ == "__main__": # only for live edit.
from bpy.utils import register_class
+
for cls in classes:
register_class(cls)
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 36d3646e883..dc445c6ae61 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -2415,7 +2415,7 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
col = layout.column()
col.prop(md, "vertex_mode")
- col. separator()
+ col.separator()
col.label(text="Object:")
col.prop(md, "object", text="")
@@ -2464,5 +2464,6 @@ classes = (
if __name__ == "__main__": # only for live edit.
from bpy.utils import register_class
+
for cls in classes:
register_class(cls)
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 a3697292d62..2898487f5a5 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -108,11 +108,6 @@ class AnnotationDrawingToolsPanel:
sub.operator("gpencil.blank_frame_add", icon='FILE_NEW')
sub.operator("gpencil.active_frames_delete_all", icon='X', text="Delete Frame(s)")
- #sub = col.column(align=True)
- #sub.prop(context.tool_settings, "use_gpencil_draw_additive", text="Additive Drawing")
- #sub.prop(context.tool_settings, "use_gpencil_continuous_drawing", text="Continuous Drawing")
- #sub.prop(context.tool_settings, "use_gpencil_draw_onback", text="Draw on Back")
-
col.separator()
col.separator()
@@ -183,9 +178,9 @@ class GreasePencilStrokeEditPanel:
if not is_3d_view:
col = layout.column(align=True)
- col.operator("transform.translate") # icon='MAN_TRANS'
- col.operator("transform.rotate") # icon='MAN_ROT'
- col.operator("transform.resize", text="Scale") # icon='MAN_SCALE'
+ col.operator("transform.translate") # icon='MAN_TRANS'
+ col.operator("transform.rotate") # icon='MAN_ROT'
+ col.operator("transform.resize", text="Scale") # icon='MAN_SCALE'
layout.separator()
@@ -399,7 +394,7 @@ class GPENCIL_MT_move_to_layer(Menu):
gpl_active = context.active_gpencil_layer
tot_layers = len(gpd.layers)
i = tot_layers - 1
- while(i >= 0):
+ while (i >= 0):
gpl = gpd.layers[i]
if gpl.info == gpl_active.info:
icon = 'GREASEPENCIL'
@@ -687,7 +682,7 @@ class GreasePencilMaterialsPanel:
row.operator("gpencil.stroke_change_color", text="Assign")
row.operator("gpencil.color_select", text="Select").deselect = False
row.operator("gpencil.color_select", text="Deselect").deselect = True
- # stroke color
+ # stroke color
ma = None
if is_view3d and brush is not None:
gp_settings = brush.gpencil_settings
@@ -700,9 +695,9 @@ class GreasePencilMaterialsPanel:
if ma is not None and ma.grease_pencil is not None:
gpcolor = ma.grease_pencil
if (
- gpcolor.stroke_style == 'SOLID' or
- gpcolor.use_stroke_pattern or
- gpcolor.use_stroke_texture_mix
+ gpcolor.stroke_style == 'SOLID' or
+ gpcolor.use_stroke_pattern or
+ gpcolor.use_stroke_texture_mix
):
row = layout.row()
row.prop(gpcolor, "color", text="Stroke Base Color")
@@ -817,6 +812,7 @@ class GreasePencilSimplifyPanel:
sub.active = rd.simplify_gpencil_view_fill
sub.prop(rd, "simplify_gpencil_remove_lines", text="Lines")
+
class GreasePencilFlipTintColors(Operator):
bl_label = "Flip Colors"
bl_idname = "gpencil.tint_flip"
@@ -841,7 +837,7 @@ class GreasePencilFlipTintColors(Operator):
except Exception as e:
utils_core.error_handlers(self, "gpencil.tint_flip", e,
- "Flip Colors could not be completed")
+ "Flip Colors could not be completed")
return {'CANCELLED'}
@@ -861,5 +857,6 @@ classes = (
if __name__ == "__main__": # only for live edit.
from bpy.utils import register_class
+
for cls in classes:
register_class(cls)
diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index a7b2589a2a2..6e07335754c 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -295,5 +295,6 @@ classes = (
if __name__ == "__main__": # only for live edit.
from bpy.utils import register_class
+
for cls in classes:
register_class(cls)
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index c59dc6227df..71e59f08ec1 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -282,6 +282,7 @@ def brush_mask_texture_settings(layout, brush):
col.prop(mask_tex_slot, "offset")
col.prop(mask_tex_slot, "scale")
+
# Basic Brush Options
#
# Share between topbar and brush panel.
@@ -345,8 +346,8 @@ def brush_basic_sculpt_settings(layout, context, brush, *, compact=False):
ups = tool_settings.unified_paint_settings
if (
- (ups.use_unified_size and ups.use_locked_size == 'SCENE') or
- ((not ups.use_unified_size) and brush.use_locked_size == 'SCENE')
+ (ups.use_unified_size and ups.use_locked_size == 'SCENE') or
+ ((not ups.use_unified_size) and brush.use_locked_size == 'SCENE')
):
UnifiedPaintPanel.prop_unified_size(row, context, brush, "unprojected_radius", slider=True, text="Radius")
else:
@@ -402,12 +403,12 @@ def brush_basic_gpencil_paint_settings(layout, _context, brush, tool, *, compact
# FIXME: tools must use their own UI drawing!
if tool.idname in {
- "builtin.arc",
- "builtin.curve",
- "builtin.line",
- "builtin.box",
- "builtin.circle",
- "builtin.polyline",
+ "builtin.arc",
+ "builtin.curve",
+ "builtin.line",
+ "builtin.box",
+ "builtin.circle",
+ "builtin.polyline",
}:
settings = _context.tool_settings.gpencil_sculpt
if is_toolbar:
@@ -487,11 +488,13 @@ def brush_basic_gpencil_vertex_settings(layout, _context, brush, tool, *, compac
row.prop(gp_settings, "pen_strength", slider=True)
row.prop(gp_settings, "use_strength_pressure", text="", icon='STYLUS_PRESSURE')
+
classes = (
VIEW3D_MT_tools_projectpaint_clone,
)
if __name__ == "__main__": # only for live edit.
from bpy.utils import register_class
+
for cls in classes:
register_class(cls)
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index d00790dc2fe..1421267afac 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -40,13 +40,13 @@ def kmi_to_string_or_none(kmi):
def generate_from_enum_ex(
- _context, *,
- idname_prefix,
- icon_prefix,
- type,
- attr,
- cursor='DEFAULT',
- tooldef_keywords={},
+ _context, *,
+ idname_prefix,
+ icon_prefix,
+ type,
+ attr,
+ cursor='DEFAULT',
+ tooldef_keywords={},
):
tool_defs = []
for enum in type.bl_rna.properties[attr].enum_items_static:
@@ -90,6 +90,7 @@ class _defs_view3d_generic:
props = tool.operator_properties("view3d.cursor3d")
layout.prop(props, "use_depth")
layout.prop(props, "orientation")
+
return dict(
idname="builtin.cursor",
label="Cursor",
@@ -130,6 +131,7 @@ class _defs_view3d_generic:
kmi_to_string_or_none(kmi_add),
kmi_to_string_or_none(kmi_remove),
)
+
return dict(
idname="builtin.measure",
label="Measure",
@@ -220,6 +222,7 @@ class _defs_annotate:
# TODO: Move this setting to tool_settings
prefs = context.preferences
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list