diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_displist.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/curve.c | 17 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/displist.c | 13 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_curve_types.h | 2 |
4 files changed, 1 insertions, 33 deletions
diff --git a/source/blender/blenkernel/BKE_displist.h b/source/blender/blenkernel/BKE_displist.h index 05e60d38487..1883cebe203 100644 --- a/source/blender/blenkernel/BKE_displist.h +++ b/source/blender/blenkernel/BKE_displist.h @@ -75,8 +75,6 @@ typedef struct DispList { int *index; int charidx; int totindex; /* indexed array drawing surfaces */ - - unsigned int *bevel_split; /* BLI_bitmap */ } DispList; void BKE_displist_copy(struct ListBase *lbn, struct ListBase *lb); diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index f3551c98f07..b0ea9b0f0d3 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -2756,7 +2756,6 @@ void BKE_curve_bevelList_make(Object *ob, ListBase *nurbs, bool for_render) bevp->tilt = bp->tilt; bevp->radius = bp->radius; bevp->weight = bp->weight; - bevp->split_tag = true; bp++; if (seglen != NULL && len != 0) { *seglen = len_v3v3(bevp->vec, bp->vec); @@ -2828,7 +2827,6 @@ void BKE_curve_bevelList_make(Object *ob, ListBase *nurbs, bool for_render) bevp->tilt = prevbezt->tilt; bevp->radius = prevbezt->radius; bevp->weight = prevbezt->weight; - bevp->split_tag = true; bevp->dupe_tag = false; bevp++; bl->nr++; @@ -2879,21 +2877,6 @@ void BKE_curve_bevelList_make(Object *ob, ListBase *nurbs, bool for_render) sizeof(BevPoint)); } - /* indicate with handlecodes double points */ - if (prevbezt->h1 == prevbezt->h2) { - if (ELEM(prevbezt->h1, 0, HD_VECT)) { - bevp->split_tag = true; - } - } - else { - if (ELEM(prevbezt->h1, 0, HD_VECT)) { - bevp->split_tag = true; - } - else if (ELEM(prevbezt->h2, 0, HD_VECT)) { - bevp->split_tag = true; - } - } - /* seglen */ if (seglen != NULL) { *seglen = 0; diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index d4581991566..829f9a94b66 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -74,9 +74,6 @@ void BKE_displist_elem_free(DispList *dl) if (dl->index) { MEM_freeN(dl->index); } - if (dl->bevel_split) { - MEM_freeN(dl->bevel_split); - } MEM_freeN(dl); } } @@ -137,10 +134,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); - - if (dl->bevel_split) { - dln->bevel_split = MEM_dupallocN(dl->bevel_split); - } } } @@ -1609,8 +1602,6 @@ static void do_makeDispListCurveTypes(Depsgraph *depsgraph, /* CU_2D conflicts with R_NOPUNOFLIP */ dl->rt = nu->flag & ~CU_2D; - dl->bevel_split = BLI_BITMAP_NEW(steps, "bevel_split"); - /* for each point of poly make a bevel piece */ BevPoint *bevp_first = bl->bevpoints; BevPoint *bevp_last = &bl->bevpoints[bl->nr - 1]; @@ -1659,10 +1650,6 @@ static void do_makeDispListCurveTypes(Depsgraph *depsgraph, } } - if (bevp->split_tag) { - BLI_BITMAP_ENABLE(dl->bevel_split, a); - } - /* rotate bevel piece and write in data */ if ((a == 0) && (bevp != bevp_last)) { rotateBevelPiece( diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index 4f914089347..ff2e7fc500a 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -72,7 +72,7 @@ typedef struct BevPoint { float sina, cosa; /** 3D Only. */ float dir[3], tan[3], quat[4]; - short split_tag, dupe_tag; + short dupe_tag; } BevPoint; /* These two Lines with # tell makesdna this struct can be excluded. */ |