[Bf-blender-cvs] [77399283d41] master: Fix T69037: Automerge is greyed-out in popover

[Anthony Eriksson]

Commit: 77399283d4133c50877f82b50801fcd3496bd145
Author: Anthony Eriksson
Date:   Fri Sep 13 09:27:59 2019 -0300
Branches: master
https://developer.blender.org/rB77399283d4133c50877f82b50801fcd3496bd145

Fix T69037: Automerge is greyed-out in popover

Split "use_mesh_automerge_and_split" and "double_threshold" into their
own column so .active doesn't have to be applied for the entire layout.

Reviewers: billreynish, mano-wii

Differential Revision: https://developer.blender.org/D5618

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 832e5a71d20..fc3749d3d3c 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -219,9 +219,10 @@ class VIEW3D_PT_tools_meshedit_options_automerge(View3DPanel, Panel):
         layout.use_property_split = True
         layout.use_property_decorate = False
 
-        layout.active = tool_settings.use_mesh_automerge
-        layout.prop(tool_settings, "use_mesh_automerge_and_split", toggle=False)
-        layout.prop(tool_settings, "double_threshold", text="Threshold")
+        col = layout.column(align=True)
+        col.active = tool_settings.use_mesh_automerge
+        col.prop(tool_settings, "use_mesh_automerge_and_split", toggle=False)
+        col.prop(tool_settings, "double_threshold", text="Threshold")
 
 # ********** default tools for editmode_curve ****************