Commit: 777e1b9654ca50af5e52052c05f6ca556e46ba9c Author: Antonioya Date: Thu Aug 2 16:22:53 2018 +0200 Branches: blender2.8 https://developer.blender.org/rB777e1b9654ca50af5e52052c05f6ca556e46ba9c
UI: Move thickness before frame lock in Annotation Panel The thickness is more important and must be below list of annotation layers. =================================================================== M release/scripts/startup/bl_ui/properties_grease_pencil_common.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 b291cc7bd82..9f2edefc3c2 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -756,12 +756,14 @@ class GreasePencilDataPanel: sub.operator("gpencil.layer_move", icon='TRIA_UP', text="").type = 'UP' sub.operator("gpencil.layer_move", icon='TRIA_DOWN', text="").type = 'DOWN' + tool_settings = context.tool_settings + if gpd and gpl: + layout.prop(gpl, "thickness") + else: + layout.prop(tool_settings, "annotation_thickness", text="Thickness") + if gpl: # layout.prop(gpl, "opacity", text="Opacity", slider=True) - # layout.prop(gpl, "thickness", text="Thickness") - # - # layout.separator() - # Full-Row - Frame Locking (and Delete Frame) row = layout.row(align=True) row.active = not gpl.lock @@ -774,11 +776,6 @@ class GreasePencilDataPanel: row.prop(gpl, "lock_frame", text=lock_label, icon='UNLOCKED') row.operator("gpencil.active_frame_delete", text="", icon='X') - tool_settings = context.tool_settings - if gpd and gpl: - layout.prop(gpl, "thickness") - else: - layout.prop(tool_settings, "annotation_thickness", text="Thickness") class GreasePencilOnionPanel: _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs