merge

1 files changed, 6 insertions, 2 deletions

diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.c b/source/blender/modifiers/intern/MOD_weighted_normal.c
index 1ed892f5464..f174b6d5aa4 100644
--- a/source/blender/modifiers/intern/MOD_weighted_normal.c
+++ b/source/blender/modifiers/intern/MOD_weighted_normal.c
@@ -713,6 +713,7 @@ static bool dependsOnNormals(ModifierData *UNUSED(md))
 
 static void panel_draw(const bContext *C, Panel *panel)
 {
+  uiLayout *col;
   uiLayout *layout = panel->layout;
 
   PointerRNA ptr;
@@ -726,8 +727,9 @@ static void panel_draw(const bContext *C, Panel *panel)
   uiItemR(layout, &ptr, "weight", 0, IFACE_("Weight"), ICON_NONE);
   uiItemR(layout, &ptr, "thresh", 0, IFACE_("Threshold"), ICON_NONE);
 
-  uiItemR(layout, &ptr, "keep_sharp", 0, NULL, ICON_NONE);
-  uiItemR(layout, &ptr, "face_influence", 0, NULL, ICON_NONE);
+  col = uiLayoutColumn(layout, false);
+  uiItemR(col, &ptr, "keep_sharp", 0, NULL, ICON_NONE);
+  uiItemR(col, &ptr, "face_influence", 0, NULL, ICON_NONE);
 
   modifier_vgroup_ui(layout, &ptr, &ob_ptr, "vertex_group", "invert_vertex_group", NULL);
 
@@ -770,4 +772,6 @@ ModifierTypeInfo modifierType_WeightedNormal = {
     /* foreachTexLink */ NULL,
     /* freeRuntimeData */ NULL,
     /* panelRegister */ panelRegister,
+    /* blendWrite */ NULL,
+    /* blendRead */ NULL,
 };