From 77399283d4133c50877f82b50801fcd3496bd145 Mon Sep 17 00:00:00 2001 From: Anthony Eriksson Date: Fri, 13 Sep 2019 09:27:59 -0300 Subject: 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 --- release/scripts/startup/bl_ui/space_view3d_toolbar.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 **************** -- cgit v1.2.3