Commit: 5d3082aa61e7687e6dad15a58c280ab63b4f85f2 Author: Antonioya Date: Fri Jul 27 12:15:21 2018 +0200 Branches: greasepencil-object https://developer.blender.org/rB5d3082aa61e7687e6dad15a58c280ab63b4f85f2
UI: Move lock options to Left Top Header These options were not tool parameters but a general option, so we move to the same UI location used in mesh sculpt. =================================================================== M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py M release/scripts/startup/bl_ui/space_topbar.py =================================================================== diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index ecf641b394e..a79de64c979 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1061,11 +1061,6 @@ class _defs_gpencil_paint: _defs_gpencil_paint.draw_color_selector(context, layout) - row.prop(context.tool_settings, "use_gpencil_draw_onback", text="", icon='ORTHO') - row.prop(tool_settings, "gpencil_stroke_placement_view3d", text='') - if tool_settings.gpencil_stroke_placement_view3d in('ORIGIN', 'CURSOR'): - row.prop(tool_settings.gpencil_sculpt, "lockaxis", text='') - row = layout.row(align=True) row.prop(gp_settings, "gpencil_fill_draw_mode", text="") row.prop(gp_settings, "gpencil_fill_show_boundary", text="", icon='GRID') @@ -1080,11 +1075,6 @@ class _defs_gpencil_paint: _defs_gpencil_paint.draw_color_selector(context, layout) - row.prop(context.tool_settings, "use_gpencil_draw_onback", text="", icon='ORTHO') - row.prop(tool_settings, "gpencil_stroke_placement_view3d", text='') - if tool_settings.gpencil_stroke_placement_view3d in('ORIGIN', 'CURSOR'): - row.prop(tool_settings.gpencil_sculpt, "lockaxis", text='') - @staticmethod def generate_from_brushes(context): @@ -1176,10 +1166,7 @@ class _defs_gpencil_sculpt: row = layout.row(align=True) row.prop(brush, "strength", slider=True) row.prop(brush, "use_pressure_strength", text="") - - row = layout.row() - row.prop(ts.gpencil_sculpt, "lockaxis", text='') - + row.separator() row.prop(ts.gpencil_sculpt, "use_select_mask", text="") @ToolDef.from_fn diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 8a243ef87a0..d05b1b932b5 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -167,6 +167,13 @@ class TOPBAR_HT_lower_bar(Header): layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".particlemode", category="") elif mode == 'OBJECT': layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".objectmode", category="") + elif mode == 'GPENCIL_PAINT': + layout.prop(context.tool_settings, "use_gpencil_draw_onback", text="", icon='ORTHO') + layout.prop(context.tool_settings, "gpencil_stroke_placement_view3d", text='') + if context.tool_settings.gpencil_stroke_placement_view3d in ('ORIGIN', 'CURSOR'): + layout.prop(context.tool_settings.gpencil_sculpt, "lockaxis", text='') + elif mode == 'GPENCIL_SCULPT': + layout.prop(context.tool_settings.gpencil_sculpt, "lockaxis", text='') class _draw_left_context_mode: _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs