[Bf-blender-cvs] [2889d8dca98] master: GPencil: Move Automerge button position in topbar

[Antonio Vazquez]

Commit: 2889d8dca986aa88b50f06782ee0a364d3b0da6c
Author: Antonio Vazquez
Date:   Mon Mar 22 15:47:59 2021 +0100
Branches: master
https://developer.blender.org/rB2889d8dca986aa88b50f06782ee0a364d3b0da6c

GPencil: Move Automerge button position in topbar

This helps to keep animation buttons grouped.

===================================================================

M	release/scripts/startup/bl_ui/space_view3d.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index fb0374695ed..c13cf97d24a 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -654,11 +654,11 @@ class VIEW3D_HT_header(Header):
                 sub = row.row(align=True)
                 sub.prop(tool_settings, "use_gpencil_draw_onback", text="", icon='MOD_OPACITY')
                 sub.separator(factor=0.4)
+                sub.prop(tool_settings, "use_gpencil_automerge_strokes", text="")
+                sub.separator(factor=0.4)
                 sub.prop(tool_settings, "use_gpencil_weight_data_add", text="", icon='WPAINT_HLT')
                 sub.separator(factor=0.4)
                 sub.prop(tool_settings, "use_gpencil_draw_additive", text="", icon='FREEZE')
-                sub.separator(factor=0.4)
-                sub.prop(tool_settings, "use_gpencil_automerge_strokes", text="")
 
             # Select mode for Editing
             if gpd.use_stroke_edit_mode: