griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix [#35097] only one curve cap is visible while backface culling is enabled - (again)

Browse Source 
also replace array copying with memcpy.
This commit is contained in:
Campbell Barton
2013-04-26 20:04:58 +00:00
parent 35ddc47d38
commit 357198d885
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/displist.c
View File

@@ -1329,11 +1329,10 @@ static void rotateBevelPiece(Curve *cu, BevPoint *bevp, BevPoint *nbevp, DispLis
static void fillBevelCap(Nurb *nu, DispList *dlb, float *prev_fp, ListBase *dispbase)
{
DispList *dl;
float *data;
int b;
dl = MEM_callocN(sizeof(DispList), "makeDispListbev2");
dl->verts = data = MEM_callocN(3 * sizeof(float) * dlb->nr, "dlverts");
dl->verts = MEM_mallocN(3 * sizeof(float) * dlb->nr, "dlverts");
memcpy(dl->verts, prev_fp, 3 * sizeof(float) * dlb->nr);
dl->type = DL_POLY;
@@ -1346,9 +1345,6 @@ static void fillBevelCap(Nurb *nu, DispList *dlb, float *prev_fp, ListBase *disp
/* CU_2D conflicts with R_NOPUNOFLIP */
dl->rt = nu->flag & ~CU_2D;
for (b = 0; b < dlb->nr; b++, prev_fp += 3, data += 3)
copy_v3_v3(data, prev_fp);
BLI_addtail(dispbase, dl);
}
@@ -1543,8 +1539,8 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
}
if (bottom_capbase.first) {
BKE_displist_fill(&bottom_capbase, dispbase, 0);
BKE_displist_fill(&top_capbase, dispbase, 0);
BKE_displist_fill(&bottom_capbase, dispbase, false);
BKE_displist_fill(&top_capbase, dispbase, true);
BKE_displist_free(&bottom_capbase);
BKE_displist_free(&top_capbase);
}