Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-09-21 00:31:29 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-09-21 01:11:50 +0300
commit08c7733c1393d200513983d9b895ef8e92110591 (patch)
tree72dc2b3621fd2ab41f5879d02d0bdae78533c7f9 /release/scripts/startup/bl_ui/properties_grease_pencil_common.py
parentfb88088203ec478f4c06bd4b755d47492246759d (diff)
Cleanup: style
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_grease_pencil_common.py')
-rw-r--r--release/scripts/startup/bl_ui/properties_grease_pencil_common.py29
1 files changed, 16 insertions, 13 deletions
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 0cb8b4b5d6e..f5b95981d66 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -309,7 +309,7 @@ class GreasePencilAppearancePanel:
if gp_settings.gpencil_brush_type == 'FILL':
layout.prop(brush, "cursor_color_add", text="Color")
- elif ob.mode in ('GPENCIL_SCULPT', 'GPENCIL_WEIGHT'):
+ elif ob.mode in {'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}:
settings = context.tool_settings.gpencil_sculpt
brush = settings.brush
@@ -816,28 +816,31 @@ class GPENCIL_UL_layer(UIList):
layout.active = False
row = layout.row(align=True)
- if gpl.is_parented:
- icon = 'BONE_DATA'
- else:
- icon = 'BLANK1'
-
- row.label(text="", icon=icon)
+ row.label(
+ text="",
+ icon='BONE_DATA' if gpl.is_parented else 'BLANK1',
+ )
row.prop(gpl, "info", text="", emboss=False)
row = layout.row(align=True)
row.prop(gpl, "lock", text="", emboss=False)
row.prop(gpl, "hide", text="", emboss=False)
row.prop(gpl, "unlock_color", text="", emboss=False)
- if gpl.use_onion_skinning is False:
- icon = 'GHOST_DISABLED'
- else:
- icon = 'GHOST_ENABLED'
subrow = row.row(align=True)
- subrow.prop(gpl, "use_onion_skinning", text="", icon=icon, emboss=False)
+ subrow.prop(
+ gpl,
+ "use_onion_skinning",
+ text="",
+ icon='GHOST_ENABLED' if gpl.use_onion_skinning else 'GHOST_DISABLED',
+ emboss=False,
+ )
subrow.active = gpd.use_onion_skinning
elif self.layout_type == 'GRID':
layout.alignment = 'CENTER'
- layout.label(text="", icon_value=icon)
+ layout.label(
+ text="",
+ icon_value=icon,
+ )
classes = (