diff options
| -rw-r--r-- | source/blender/blenkernel/intern/curve.c | 12 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/displist.c | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 8bc22b590b6..0abe956b599 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -1085,12 +1085,6 @@ void BKE_nurb_makeFaces(Nurb *nu, float *coord_array, int rowstride, int resolu, sum = (float *)MEM_callocN(sizeof(float) * len, "makeNurbfaces1"); - len = totu * totv; - if (len == 0) { - MEM_freeN(sum); - return; - } - bp = nu->bp; i = nu->pntsu * nu->pntsv; ratcomp = 0; @@ -1193,6 +1187,8 @@ void BKE_nurb_makeFaces(Nurb *nu, float *coord_array, int rowstride, int resolu, } } + zero_v3(in); + /* one! (1.0) real point now */ fp = sum; for (j = jsta; j <= jen; j++) { @@ -1307,6 +1303,8 @@ void BKE_nurb_makeCurve(Nurb *nu, float *coord_array, float *tilt_array, float * } } + zero_v3(coord_fp); + /* one! (1.0) real point */ fp = sum; bp = nu->bp + istart - 1; @@ -1473,7 +1471,7 @@ float *BKE_curve_surf_make_orco(Object *ob) } else { int size = (nu->pntsu * resolu) * (nu->pntsv * resolv) * 3 * sizeof(float); - float *_tdata = MEM_callocN(size, "temp data"); + float *_tdata = MEM_mallocN(size, "temp data"); float *tdata = _tdata; BKE_nurb_makeFaces(nu, tdata, 0, resolu, resolv); diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 9c44f4342c5..cf894e72324 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -397,7 +397,7 @@ static void curve_to_displist(Curve *cu, ListBase *nubase, ListBase *dispbase, len = (resolu * SEGMENTSU(nu)); dl = MEM_callocN(sizeof(DispList), "makeDispListsurf"); - dl->verts = MEM_callocN(len * sizeof(float[3]), "dlverts"); + dl->verts = MEM_mallocN(len * sizeof(float[3]), "dlverts"); BLI_addtail(dispbase, dl); dl->parts = 1; @@ -1223,7 +1223,7 @@ void BKE_displist_make_surf(Scene *scene, Object *ob, ListBase *dispbase, len = SEGMENTSU(nu) * resolu; dl = MEM_callocN(sizeof(DispList), "makeDispListsurf"); - dl->verts = MEM_callocN(len * sizeof(float[3]), "dlverts"); + dl->verts = MEM_mallocN(len * sizeof(float[3]), "dlverts"); BLI_addtail(dispbase, dl); dl->parts = 1; |