diff options
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r-- | source/blender/editors/mesh/mesh_data.c | 9 | ||||
-rw-r--r-- | source/blender/editors/mesh/meshtools.c | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index d7d1dc7dcae..0f58752f323 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -1019,11 +1019,6 @@ static int mesh_customdata_custom_splitnormals_add_exec(bContext *C, wmOperator /* Tag edges as sharp according to smooth threshold if needed, * to preserve autosmooth shading. */ if (me->flag & ME_AUTOSMOOTH) { - float(*polynors)[3] = MEM_mallocN(sizeof(*polynors) * (size_t)me->totpoly, __func__); - - BKE_mesh_calc_normals_poly( - me->mvert, me->totvert, me->mloop, me->totloop, me->mpoly, me->totpoly, polynors); - BKE_edges_sharp_from_angle_set(me->mvert, me->totvert, me->medge, @@ -1031,11 +1026,9 @@ static int mesh_customdata_custom_splitnormals_add_exec(bContext *C, wmOperator me->mloop, me->totloop, me->mpoly, - polynors, + BKE_mesh_poly_normals_ensure(me), me->totpoly, me->smoothresh); - - MEM_freeN(polynors); } CustomData_add_layer(data, CD_CUSTOMLOOPNORMAL, CD_DEFAULT, NULL, me->totloop); diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index ebe8b758aa2..c9615698c46 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -1363,8 +1363,7 @@ typedef struct VertPickData { static void ed_mesh_pick_vert__mapFunc(void *userData, int index, const float co[3], - const float UNUSED(no_f[3]), - const short UNUSED(no_s[3])) + const float UNUSED(no[3])) { VertPickData *data = userData; if ((data->mvert[index].flag & ME_HIDE) == 0) { |