[Bf-blender-cvs] [9f9dbaf22b1] master: Fix some inactive modifier properties not being editable

[Brecht Van Lommel]

Commit: 9f9dbaf22b19399396f7aa9a22a8cb5b43e82171
Author: Brecht Van Lommel
Date:   Thu Oct 1 12:13:38 2020 +0200
Branches: master
https://developer.blender.org/rB9f9dbaf22b19399396f7aa9a22a8cb5b43e82171

Fix some inactive modifier properties not being editable

The convention is to keep inactive settings editable even if they are grayed
out for having no effect due to other settings.

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

M	source/blender/modifiers/intern/MOD_mesh_to_volume.cc
M	source/blender/modifiers/intern/MOD_multires.c
M	source/blender/modifiers/intern/MOD_subsurf.c

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

diff --git a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc
index 1cb141feaf4..b5d462ce842 100644
--- a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc
+++ b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc
@@ -154,7 +154,7 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
     uiItemR(col, ptr, "exterior_band_width", 0, NULL, ICON_NONE);
 
     uiLayout *subcol = uiLayoutColumn(col, false);
-    uiLayoutSetEnabled(subcol, !mvmd->fill_volume);
+    uiLayoutSetActive(subcol, !mvmd->fill_volume);
     uiItemR(subcol, ptr, "interior_band_width", 0, NULL, ICON_NONE);
   }
   {
diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c
index 41188fcc907..397e4e2c698 100644
--- a/source/blender/modifiers/intern/MOD_multires.c
+++ b/source/blender/modifiers/intern/MOD_multires.c
@@ -482,13 +482,13 @@ static void advanced_panel_draw(const bContext *UNUSED(C), Panel *panel)
 
   uiLayoutSetPropSep(layout, true);
 
-  uiLayoutSetEnabled(layout, !has_displacement);
+  uiLayoutSetActive(layout, !has_displacement);
 
   uiItemR(layout, ptr, "subdivision_type", 0, NULL, ICON_NONE);
   uiItemR(layout, ptr, "quality", 0, NULL, ICON_NONE);
 
   col = uiLayoutColumn(layout, false);
-  uiLayoutSetEnabled(col, true);
+  uiLayoutSetActive(col, true);
   uiItemR(col, ptr, "uv_smooth", 0, NULL, ICON_NONE);
   uiItemR(col, ptr, "boundary_smooth", 0, NULL, ICON_NONE);
 
diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c
index 10d7b21d56f..2fb98bd1def 100644
--- a/source/blender/modifiers/intern/MOD_subsurf.c
+++ b/source/blender/modifiers/intern/MOD_subsurf.c
@@ -469,7 +469,7 @@ static void advanced_panel_draw(const bContext *C, Panel *panel)
   uiItemR(layout, ptr, "use_limit_surface", 0, NULL, ICON_NONE);
 
   uiLayout *col = uiLayoutColumn(layout, true);
-  uiLayoutSetEnabled(col, RNA_boolean_get(ptr, "use_limit_surface"));
+  uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_limit_surface"));
   uiItemR(col, ptr, "quality", 0, NULL, ICON_NONE);
 
   uiItemR(layout, ptr, "uv_smooth", 0, NULL, ICON_NONE);