[Bf-blender-cvs] [915fd3d088c] modifier-panels-ui: Simplify Edge Split Modifier Layout

[Hans Goudey]

Commit: 915fd3d088c4628cb4e079b6fb155c3babfd48c7
Author: Hans Goudey
Date:   Wed Apr 15 09:47:44 2020 -0500
Branches: modifier-panels-ui
https://developer.blender.org/rB915fd3d088c4628cb4e079b6fb155c3babfd48c7

Simplify Edge Split Modifier Layout

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

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

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

diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c
index 3faaca37165..0273d514f07 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -140,49 +140,29 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *UNUSED(c
 
 static void panel_draw(const bContext *C, Panel *panel)
 {
+  uiLayout *row, *sub;
   uiLayout *layout = panel->layout;
+
   PointerRNA ptr;
-  PointerRNA ob_ptr;
-  modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr);
+  modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
   modifier_panel_buttons(C, panel);
 
   uiLayoutSetPropSep(layout, true);
 
+  row = uiLayoutRowWithHeading(layout, true, IFACE_("Edge Angle"));
+  uiItemR(row, &ptr, "use_edge_angle", 0, "", ICON_NONE);
+  sub = uiLayoutRow(row, true);
+  uiLayoutSetActive(sub, RNA_boolean_get(&ptr, "use_edge_angle"));
+  uiItemR(sub, &ptr, "split_angle", 0, "", ICON_NONE);
+
   uiItemR(layout, &ptr, "use_edge_sharp", 0, IFACE_("Sharp Edges"), ICON_NONE);
 
   modifier_panel_end(layout, &ptr);
 }
 
-static void edge_angle_panel_draw_header(const bContext *C, Panel *panel)
-{
-  PointerRNA ptr;
-  modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
-  uiLayout *layout = panel->layout;
-
-  uiItemR(layout, &ptr, "use_edge_angle", 0, "", ICON_NONE);
-}
-
-static void edge_angle_panel_draw(const bContext *C, Panel *panel)
-{
-  uiLayout *layout = panel->layout;
-  PointerRNA ptr;
-  PointerRNA ob_ptr;
-  modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr);
-
-  uiLayoutSetPropSep(layout, true);
-  uiLayoutSetActive(layout, RNA_boolean_get(&ptr, "use_edge_angle"));
-  uiItemR(layout, &ptr, "split_angle", 0, NULL, ICON_NONE);
-}
-
 static void panelRegister(ARegionType *region_type)
 {
-  PanelType *panel_type = modifier_panel_register(region_type, "EdgeSplit", panel_draw);
-  modifier_subpanel_register(region_type,
-                             "edgesplit_",
-                             "Edge Angle",
-                             edge_angle_panel_draw_header,
-                             edge_angle_panel_draw,
-                             panel_type);
+  modifier_panel_register(region_type, "EdgeSplit", panel_draw);
 }
 
 ModifierTypeInfo modifierType_EdgeSplit = {