diff options
Diffstat (limited to 'source/blender/modifiers/intern/MOD_normal_edit.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_normal_edit.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/source/blender/modifiers/intern/MOD_normal_edit.c b/source/blender/modifiers/intern/MOD_normal_edit.c index 87d75c6f1a7..a24ed4d6614 100644 --- a/source/blender/modifiers/intern/MOD_normal_edit.c +++ b/source/blender/modifiers/intern/MOD_normal_edit.c @@ -38,6 +38,7 @@ #include "BLI_bitmap.h" #include "BKE_cdderivedmesh.h" +#include "BKE_library_query.h" #include "BKE_mesh.h" #include "BKE_deform.h" @@ -84,7 +85,7 @@ static void generate_vert_coordinates( /* Translate our coordinates so that center of ob_center is at (0, 0, 0). */ /* Get ob_center (world) coordinates in ob local coordinates. - * No need to take into accound ob_center's space here, see T44027. */ + * No need to take into account ob_center's space here, see T44027. */ invert_m4_m4(inv_obmat, ob->obmat); mul_v3_m4v3(diff, inv_obmat, ob_center->obmat[3]); negate_v3(diff); @@ -387,7 +388,7 @@ static DerivedMesh *normalEditModifier_do(NormalEditModifierData *smd, Object *o polynors = dm->getPolyDataArray(dm, CD_NORMAL); if (!polynors) { polynors = MEM_mallocN(sizeof(*polynors) * num_polys, __func__); - BKE_mesh_calc_normals_poly(mvert, num_verts, mloop, mpoly, num_loops, num_polys, polynors, false); + BKE_mesh_calc_normals_poly(mvert, NULL, num_verts, mloop, mpoly, num_loops, num_polys, polynors, false); free_polynors = true; } @@ -450,14 +451,7 @@ static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk, { NormalEditModifierData *smd = (NormalEditModifierData *) md; - walk(userData, ob, &smd->target); -} - -static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData) -{ - NormalEditModifierData *smd = (NormalEditModifierData *) md; - - walk(userData, ob, (ID **)&smd->target); + walk(userData, ob, &smd->target, IDWALK_NOP); } static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams)) @@ -524,6 +518,6 @@ ModifierTypeInfo modifierType_NormalEdit = { /* dependsOnTime */ NULL, /* dependsOnNormals */ dependsOnNormals, /* foreachObjectLink */ foreachObjectLink, - /* foreachIDLink */ foreachIDLink, + /* foreachIDLink */ NULL, /* foreachTexLink */ NULL, }; |