From ea3bca75d91d140df4c46b501809e4c6e4e8f2d5 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 15 Jun 2014 14:56:59 +1000 Subject: Curve: remove unused displist members --- source/blender/blenkernel/BKE_displist.h | 1 - source/blender/blenkernel/intern/displist.c | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_displist.h b/source/blender/blenkernel/BKE_displist.h index face19adc1e..0afc457f2b5 100644 --- a/source/blender/blenkernel/BKE_displist.h +++ b/source/blender/blenkernel/BKE_displist.h @@ -72,7 +72,6 @@ typedef struct DispList { short col, rt; /* rt used by initrenderNurbs */ float *verts, *nors; int *index; - unsigned int *col1, *col2; int charidx; int totindex; /* indexed array drawing surfaces */ diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 7caf3d6dc49..cf894e72324 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -71,8 +71,6 @@ void BKE_displist_elem_free(DispList *dl) if (dl->verts) MEM_freeN(dl->verts); if (dl->nors) MEM_freeN(dl->nors); if (dl->index) MEM_freeN(dl->index); - if (dl->col1) MEM_freeN(dl->col1); - if (dl->col2) MEM_freeN(dl->col2); if (dl->bevelSplitFlag) MEM_freeN(dl->bevelSplitFlag); MEM_freeN(dl); } @@ -145,8 +143,6 @@ void BKE_displist_copy(ListBase *lbn, ListBase *lb) dln->verts = MEM_dupallocN(dl->verts); dln->nors = MEM_dupallocN(dl->nors); dln->index = MEM_dupallocN(dl->index); - dln->col1 = MEM_dupallocN(dl->col1); - dln->col2 = MEM_dupallocN(dl->col2); if (dl->bevelSplitFlag) dln->bevelSplitFlag = MEM_dupallocN(dl->bevelSplitFlag); @@ -1700,7 +1696,7 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba /* CU_2D conflicts with R_NOPUNOFLIP */ dl->rt = nu->flag & ~CU_2D; - dl->bevelSplitFlag = MEM_callocN(sizeof(*dl->col2) * ((steps + 0x1F) >> 5), + dl->bevelSplitFlag = MEM_callocN(sizeof(*dl->bevelSplitFlag) * ((steps + 0x1F) >> 5), "bevelSplitFlag"); /* for each point of poly make a bevel piece */ -- cgit v1.2.3