Curve: remove unused displist members
authorCampbell Barton <ideasman42@gmail.com>
Sun, 15 Jun 2014 04:56:59 +0000 (14:56 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 15 Jun 2014 04:56:59 +0000 (14:56 +1000)
source/blender/blenkernel/BKE_displist.h
source/blender/blenkernel/intern/displist.c

index face19adc1efc76a2c0de09c8cb842486261d2d1..0afc457f2b5e03220ca2af1eb8c639634df8da10 100644 (file)
@@ -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 */
 
index 7caf3d6dc498a49628e288217903820401c5ada2..cf894e72324d61c04a6069230479e4e7c313cf75 100644 (file)
@@ -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 */