[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56330] trunk/blender/source/blender/ blenkernel/intern/displist.c: fix [#35097] only one curve cap is visible while backface culling is enabled - (again)

Campbell Barton ideasman42 at gmail.com
Fri Apr 26 22:04:59 CEST 2013


Revision: 56330
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56330
Author:   campbellbarton
Date:     2013-04-26 20:04:58 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
fix [#35097] only one curve cap is visible while backface culling is enabled - (again)
also replace array copying with memcpy.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/displist.c

Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c	2013-04-26 19:25:56 UTC (rev 56329)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c	2013-04-26 20:04:58 UTC (rev 56330)
@@ -1329,11 +1329,10 @@
 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 @@
 	/* 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 @@
 						}
 
 						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);
 						}




More information about the Bf-blender-cvs mailing list