1 files changed, 8 insertions, 18 deletions

diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index ab024bd824d..04ddac338e5 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -30,6 +30,7 @@
 #include "BLT_translation.h"
 
 #include "DNA_curveprofile_types.h"
+#include "DNA_defaults.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
@@ -63,22 +64,10 @@ static void initData(ModifierData *md)
 {
   BevelModifierData *bmd = (BevelModifierData *)md;
 
-  bmd->value = 0.1f;
-  bmd->res = 1;
-  bmd->flags = 0;
-  bmd->val_flags = MOD_BEVEL_AMT_OFFSET;
-  bmd->lim_flags = 0;
-  bmd->e_flags = 0;
-  bmd->edge_flags = 0;
-  bmd->face_str_mode = MOD_BEVEL_FACE_STRENGTH_NONE;
-  bmd->miter_inner = MOD_BEVEL_MITER_SHARP;
-  bmd->miter_outer = MOD_BEVEL_MITER_SHARP;
-  bmd->affect_type = MOD_BEVEL_AFFECT_EDGES;
-  bmd->spread = 0.1f;
-  bmd->mat = -1;
-  bmd->profile = 0.5f;
-  bmd->bevel_angle = DEG2RADF(30.0f);
-  bmd->defgrp_name[0] = '\0';
+  BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(bmd, modifier));
+
+  MEMCPY_STRUCT_AFTER(bmd, DNA_struct_default_get(BevelModifierData), modifier);
+
   bmd->custom_profile = BKE_curveprofile_add(PROF_PRESET_LINE);
 }
 
@@ -219,7 +208,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
   Object *ob = ctx->object;
 
   if (harden_normals && (ob->type == OB_MESH) && !(((Mesh *)ob->data)->flag & ME_AUTOSMOOTH)) {
-    BKE_modifier_set_error(md, "Enable 'Auto Smooth' in Object Data Properties");
+    BKE_modifier_set_error(ob, md, "Enable 'Auto Smooth' in Object Data Properties");
     harden_normals = false;
   }
 
@@ -446,9 +435,11 @@ ModifierTypeInfo modifierType_Bevel = {
     /* name */ "Bevel",
     /* structName */ "BevelModifierData",
     /* structSize */ sizeof(BevelModifierData),
+    /* srna */ &RNA_BevelModifier,
     /* type */ eModifierTypeType_Constructive,
     /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode |
         eModifierTypeFlag_EnableInEditmode | eModifierTypeFlag_AcceptsCVs,
+    /* icon */ ICON_MOD_BEVEL,
     /* copyData */ copyData,
     /* deformVerts */ NULL,
     /* deformMatrices */ NULL,
@@ -465,7 +456,6 @@ ModifierTypeInfo modifierType_Bevel = {
     /* updateDepsgraph */ NULL,
     /* dependsOnTime */ NULL,
     /* dependsOnNormals */ dependsOnNormals,
-    /* foreachObjectLink */ NULL,
     /* foreachIDLink */ NULL,
     /* foreachTexLink */ NULL,
     /* freeRuntimeData */ NULL,