Revision: 43853
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43853
Author: nazgul
Date: 2012-02-02 18:50:44 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
Fix for recent bevel cap option
"Holes" used to be ignored (i.e. when using "Text" as bevel object "e" wouldn't
have a "hole").
Resolved by collecting all polys needed for top and bottom cap and filling them
at once
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 2012-02-02
15:15:52 UTC (rev 43852)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c 2012-02-02
18:50:44 UTC (rev 43853)
@@ -1209,9 +1209,8 @@
*data_r = data;
}
-static void fillBevelCap(Curve *cu, Nurb *nu, BevPoint *bevp, DispList *dlb,
float fac, float widfac, int flipnormal, ListBase *dispbase)
+static void fillBevelCap(Curve *cu, Nurb *nu, BevPoint *bevp, DispList *dlb,
float fac, float widfac, ListBase *dispbase)
{
- ListBase tmpdisp = {NULL, NULL};
DispList *dl;
float *data;
@@ -1231,9 +1230,7 @@
rotateBevelPiece(cu, bevp, dlb, widfac, fac, &data);
- BLI_addtail(&tmpdisp, dl);
- filldisplist(&tmpdisp, dispbase, flipnormal);
- freedisplist(&tmpdisp);
+ BLI_addtail(dispbase, dl);
}
static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase
*dispbase,
@@ -1319,10 +1316,10 @@
}
else {
DispList *dlb;
+ ListBase bottom_capbase =
{NULL, NULL};
+ ListBase top_capbase = {NULL,
NULL};
for (dlb=dlbev.first; dlb;
dlb=dlb->next) {
- ListBase capbase =
{NULL, NULL};
-
/* for each part of the
bevel use a separate displblock */
dl=
MEM_callocN(sizeof(DispList), "makeDispListbev1");
dl->verts= data=
MEM_callocN(3*sizeof(float)*dlb->nr*bl->nr, "dlverts");
@@ -1364,15 +1361,22 @@
rotateBevelPiece(cu, bevp, dlb, widfac, fac, &data);
if (cu->flag &
CU_FILL_CAPS) {
- if (a
== 0 || a == bl->nr - 1)
-
fillBevelCap(cu, nu, bevp, dlb, fac, widfac, a == 0, &capbase);
+ if (a
== 0)
+
fillBevelCap(cu, nu, bevp, dlb, fac, widfac, &bottom_capbase);
+ else if
(a == bl->nr - 1)
+
fillBevelCap(cu, nu, bevp, dlb, fac, widfac, &top_capbase);
}
}
/* gl array drawing:
using indices */
displist_surf_indices(dl);
+ }
-
BLI_movelisttolist(dispbase, &capbase);
+ if(bottom_capbase.first) {
+
filldisplist(&bottom_capbase, dispbase, 1);
+
filldisplist(&top_capbase, dispbase, 0);
+
freedisplist(&bottom_capbase);
+
freedisplist(&top_capbase);
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
