[Bf-blender-cvs] [7f997d8269d] greasepencil-object: GPencil: Resorder List icons to be consistent
Antonio Vazquez
noreply at git.blender.org
Thu Nov 28 19:36:11 CET 2019
Commit: 7f997d8269d47ce198100e88665fd60fc63a9142
Author: Antonio Vazquez
Date: Thu Nov 28 19:36:01 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB7f997d8269d47ce198100e88665fd60fc63a9142
GPencil: Resorder List icons to be consistent
Now the icons are in the same order in Dopesheet, Layers and Material list
===================================================================
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M release/scripts/startup/bl_ui/properties_material_gpencil.py
===================================================================
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 2898487f5a5..571944eb65f 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -767,8 +767,6 @@ class GPENCIL_UL_layer(UIList):
icon='MOD_MASK' if gpl.mask_layer else 'LAYER_ACTIVE',
emboss=False)
- row.prop(gpl, "lock", text="", emboss=False)
- row.prop(gpl, "hide", text="", emboss=False)
subrow = row.row(align=True)
subrow.prop(
gpl,
@@ -777,6 +775,8 @@ class GPENCIL_UL_layer(UIList):
icon='ONIONSKIN_ON' if gpl.use_onion_skinning else 'ONIONSKIN_OFF',
emboss=False,
)
+ row.prop(gpl, "hide", text="", emboss=False)
+ row.prop(gpl, "lock", text="", emboss=False)
elif self.layout_type == 'GRID':
layout.alignment = 'CENTER'
layout.label(
diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index 6e07335754c..1f4ec108c58 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -69,13 +69,13 @@ class GPENCIL_UL_matslots(UIList):
row.prop(ma, "name", text="", emboss=False, icon_value=icon)
row = layout.row(align=True)
- row.prop(gpcolor, "lock", text="", emboss=False)
- row.prop(gpcolor, "hide", text="", emboss=False)
if gpcolor.ghost is True:
icon = 'ONIONSKIN_OFF'
else:
icon = 'ONIONSKIN_ON'
row.prop(gpcolor, "ghost", text="", icon=icon, emboss=False)
+ row.prop(gpcolor, "hide", text="", emboss=False)
+ row.prop(gpcolor, "lock", text="", emboss=False)
elif self.layout_type == 'GRID':
layout.alignment = 'CENTER'
More information about the Bf-blender-cvs
mailing list