[Bf-blender-cvs] [adad62e8d62] modifier-panels-ui: Add new options to solidify modifier

[Hans Goudey]

Commit: adad62e8d6217863b8a0e62ff6b2568ab11f38b8
Author: Hans Goudey
Date:   Tue Apr 14 16:54:08 2020 -0500
Branches: modifier-panels-ui
https://developer.blender.org/rBadad62e8d6217863b8a0e62ff6b2568ab11f38b8

Add new options to solidify modifier

The subpanel organization might need to be rethought here, some of the
new items don't fit perfectly into the categories.

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

M	source/blender/modifiers/intern/MOD_solidify.c

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

diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c
index 65c40bda2a8..cd65b8c80ca 100644
--- a/source/blender/modifiers/intern/MOD_solidify.c
+++ b/source/blender/modifiers/intern/MOD_solidify.c
@@ -122,7 +122,9 @@ static void panel_draw(const bContext *C, Panel *panel)
   uiItemR(layout, &ptr, "thickness", 0, NULL, ICON_NONE);
   uiItemR(layout, &ptr, "offset", 0, NULL, ICON_NONE);
 
-  col = uiLayoutColumnWithHeading(layout, false, "Normal");
+  if (solidify_mode == MOD_SOLIDIFY_MODE_NONMANIFOLD) {
+    uiItemR(layout, &ptr, "nonmanifold_merge_threshold", 0, NULL, ICON_NONE);
+  }
 
   col = uiLayoutColumnWithHeading(layout, false, "Rim");
   uiItemR(col, &ptr, "use_rim", 0, IFACE_("Fill"), ICON_NONE);
@@ -142,6 +144,12 @@ static void panel_draw(const bContext *C, Panel *panel)
   uiLayoutSetActive(row, has_vertex_group);
   uiItemR(row, &ptr, "thickness_vertex_group", 0, IFACE_("Factor"), ICON_NONE);
 
+  if (solidify_mode == MOD_SOLIDIFY_MODE_NONMANIFOLD) {
+    row = uiLayoutRow(layout, false);
+    uiLayoutSetActive(row, has_vertex_group);
+    uiItemR(row, &ptr, "use_flat_faces", 0, NULL, ICON_NONE);
+  }
+
   modifier_panel_end(layout, &ptr);
 }
 
@@ -181,7 +189,7 @@ static void materials_panel_draw(const bContext *C, Panel *panel)
   uiItemR(col, &ptr, "material_offset_rim", 0, IFACE_("Rim"), ICON_NONE);
 }
 
-static void crease_panel_draw(const bContext *C, Panel *panel)
+static void edge_data_panel_draw(const bContext *C, Panel *panel)
 {
   uiLayout *layout = panel->layout;
 
@@ -193,10 +201,12 @@ static void crease_panel_draw(const bContext *C, Panel *panel)
 
   uiLayoutSetPropSep(layout, true);
 
-  uiLayoutSetActive(layout, solidify_mode == MOD_SOLIDIFY_MODE_EXTRUDE);
-  uiItemR(layout, &ptr, "edge_crease_inner", 0, IFACE_("Inner"), ICON_NONE);
-  uiItemR(layout, &ptr, "edge_crease_outer", 0, IFACE_("Outer"), ICON_NONE);
-  uiItemR(layout, &ptr, "edge_crease_rim", 0, IFACE_("Rim"), ICON_NONE);
+  if (solidify_mode == MOD_SOLIDIFY_MODE_EXTRUDE) {
+    uiItemR(layout, &ptr, "edge_crease_inner", 0, IFACE_("Inner"), ICON_NONE);
+    uiItemR(layout, &ptr, "edge_crease_outer", 0, IFACE_("Outer"), ICON_NONE);
+    uiItemR(layout, &ptr, "edge_crease_rim", 0, IFACE_("Rim"), ICON_NONE);
+  }
+  uiItemR(layout, &ptr, "bevel_convex", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
 }
 
 static void clamp_panel_draw(const bContext *C, Panel *panel)
@@ -238,9 +248,9 @@ static void panelRegister(ARegionType *region_type)
   modifier_subpanel_register(
       region_type, "solidify_materials", "Materials", NULL, materials_panel_draw, panel_type);
   modifier_subpanel_register(
-      region_type, "solidify_crease", "Crease", NULL, crease_panel_draw, panel_type);
+      region_type, "solidify_edge_data", "Edge Data", NULL, edge_data_panel_draw, panel_type);
   modifier_subpanel_register(
-      region_type, "solidify_clamp", "Clamp", NULL, clamp_panel_draw, panel_type);
+      region_type, "solidify_clamp", "Thickness Clamp", NULL, clamp_panel_draw, panel_type);
   modifier_subpanel_register(region_type,
                              "solidify_vertex_groups",
                              "Output Vertex Groups",