[Bf-blender-cvs] [fa9e1a58739] modifier-panels-ui: Modifier UI: Standardize naming and order of functions

[Hans Goudey]

Commit: fa9e1a58739a4c7ec6ec1cfe224fc64b308e9a71
Author: Hans Goudey
Date:   Sat Apr 4 19:28:12 2020 -0500
Branches: modifier-panels-ui
https://developer.blender.org/rBfa9e1a58739a4c7ec6ec1cfe224fc64b308e9a71

Modifier UI: Standardize naming and order of functions

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

M	source/blender/modifiers/intern/MOD_array.c
M	source/blender/modifiers/intern/MOD_displace.c
M	source/blender/modifiers/intern/MOD_screw.c

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

diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index 62ef627858a..4542f82372b 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -805,7 +805,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
 
 static void panel_draw(const bContext *C, Panel *panel)
 {
-  uiLayout *sub, *col, *split;
+  uiLayout *col;
   uiLayout *layout = panel->layout;
 
   PointerRNA ptr;
@@ -912,7 +912,7 @@ static void object_offset_draw(const bContext *C, Panel *panel)
   uiItemR(col, &ptr, "offset_object", 0, NULL, ICON_NONE);
 }
 
-static void merge_header_draw(const bContext *C, Panel *panel)
+static void symmetry_panel_header_draw(const bContext *C, Panel *panel)
 {
   uiLayout *layout = panel->layout;
 
@@ -922,7 +922,7 @@ static void merge_header_draw(const bContext *C, Panel *panel)
   uiItemR(layout, &ptr, "use_merge_vertices", 0, IFACE_("Merge"), ICON_NONE);
 }
 
-static void merge_panel_draw(const bContext *C, Panel *panel)
+static void symmetry_panel_draw(const bContext *C, Panel *panel)
 {
   uiLayout *layout = panel->layout;
 
@@ -974,7 +974,7 @@ static void panelRegister(ARegionType *region_type)
                              object_offset_draw,
                              panel_type);
   modifier_subpanel_register(
-      region_type, "array_merge", "", merge_header_draw, merge_panel_draw, panel_type);
+      region_type, "array_merge", "", symmetry_panel_header_draw, symmetry_panel_draw, panel_type);
   modifier_subpanel_register(region_type, "array_uv", "UVs", NULL, uv_panel_draw, panel_type);
 }
 
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index 4a3b5f04ec7..2d03e9bbb9d 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -464,9 +464,8 @@ static void panel_draw(const bContext *C, Panel *panel)
   uiItemR(col, &ptr, "mid_level", 0, NULL, ICON_NONE);
 
   row = uiLayoutRow(col, true);
-  uiItemPointerR(row, &ptr, "vertex_group", &ob_ptr, "vertex_groups", 0, ICON_NONE);
+  uiItemPointerR(row, &ptr, "vertex_group", &ob_ptr, "vertex_groups", NULL, ICON_NONE);
   sub = uiLayoutColumn(row, true);
-  uiLayoutSetPropDecorate(sub, false);
   uiLayoutSetActive(sub, has_vertex_group);
   uiItemR(sub, &ptr, "invert_vertex_group", 0, "", ICON_ARROW_LEFTRIGHT);
 
diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c
index 417fa8aea58..04b84a5037c 100644
--- a/source/blender/modifiers/intern/MOD_screw.c
+++ b/source/blender/modifiers/intern/MOD_screw.c
@@ -1213,12 +1213,12 @@ static void panel_draw(const bContext *C, Panel *panel)
   uiLayoutSetPropSep(row, false);
   uiItemR(row, &ptr, "use_stretch_u", UI_ITEM_R_TOGGLE, IFACE_("U"), ICON_NONE);
   uiItemR(row, &ptr, "use_stretch_v", UI_ITEM_R_TOGGLE, IFACE_("V"), ICON_NONE);
-  uiItemL(row, IFACE_(""), ICON_BLANK1);
+  uiItemL(row, "", ICON_BLANK1);
 
   modifier_panel_end(layout, &ptr);
 }
 
-static void screw_merge_header_draw(const bContext *C, Panel *panel)
+static void symmetry_panel_header_draw(const bContext *C, Panel *panel)
 {
   uiLayout *layout = panel->layout;
 
@@ -1228,8 +1228,9 @@ static void screw_merge_header_draw(const bContext *C, Panel *panel)
   uiItemR(layout, &ptr, "use_merge_vertices", 0, NULL, ICON_NONE);
 }
 
-static void screw_merge_draw(const bContext *C, Panel *panel)
+static void symmetry_panel_draw(const bContext *C, Panel *panel)
 {
+  uiLayout *col;
   uiLayout *layout = panel->layout;
 
   PointerRNA ptr;
@@ -1237,14 +1238,14 @@ static void screw_merge_draw(const bContext *C, Panel *panel)
 
   uiLayoutSetPropSep(layout, true);
 
-  uiLayout *col = uiLayoutColumn(layout, false);
-
+  col = uiLayoutColumn(layout, false);
   uiLayoutSetActive(col, RNA_boolean_get(&ptr, "use_merge_vertices"));
   uiItemR(col, &ptr, "merge_threshold", 0, IFACE_("Distance"), ICON_NONE);
 }
 
-static void screw_normals_draw(const bContext *C, Panel *panel)
+static void normals_panel_draw(const bContext *C, Panel *panel)
 {
+  uiLayout *col;
   uiLayout *layout = panel->layout;
 
   PointerRNA ptr;
@@ -1252,8 +1253,7 @@ static void screw_normals_draw(const bContext *C, Panel *panel)
 
   uiLayoutSetPropSep(layout, true);
 
-  uiLayout *col = uiLayoutColumn(layout, false);
-
+  col = uiLayoutColumn(layout, false);
   uiItemR(col, &ptr, "use_smooth_shade", 0, NULL, ICON_NONE);
   uiItemR(col, &ptr, "use_normal_calculate", 0, NULL, ICON_NONE);
   uiItemR(col, &ptr, "use_normal_flip", 0, NULL, ICON_NONE);
@@ -1263,9 +1263,9 @@ static void panelRegister(ARegionType *region_type)
 {
   PanelType *panel_type = modifier_panel_register(region_type, "Screw", panel_draw);
   modifier_subpanel_register(
-      region_type, "screw_merge", "", screw_merge_header_draw, screw_merge_draw, panel_type);
+      region_type, "screw_merge", "", symmetry_panel_header_draw, symmetry_panel_draw, panel_type);
   modifier_subpanel_register(
-      region_type, "screw_normals", "Normals", NULL, screw_normals_draw, panel_type);
+      region_type, "screw_normals", "Normals", NULL, normals_panel_draw, panel_type);
 }
 
 ModifierTypeInfo modifierType_Screw = {