Revision: 43573
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43573
Author: campbellbarton
Date: 2012-01-20 22:09:30 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
fix 2 bugs
- box packing wasn't flagging out the right free corner of a vertex in some
cases.
- tex_space_curve wasn't counting quad displists properly.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenlib/intern/boxpack2d.c
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2012-01-20
19:27:04 UTC (rev 43572)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2012-01-20
22:09:30 UTC (rev 43573)
@@ -368,9 +368,8 @@
dl= cu->disp.first;
while(dl) {
- if(dl->type==DL_INDEX3 || dl->type==DL_INDEX3) tot= dl->nr;
- else tot= dl->nr*dl->parts;
-
+ tot = ELEM(dl->type, DL_INDEX3, DL_INDEX4) ? dl->nr : dl->nr *
dl->parts;
+
if(tot) doit= 1;
fp= dl->verts;
while(tot--) {
Modified: trunk/blender/source/blender/blenlib/intern/boxpack2d.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/boxpack2d.c 2012-01-20
19:27:04 UTC (rev 43572)
+++ trunk/blender/source/blender/blenlib/intern/boxpack2d.c 2012-01-20
22:09:30 UTC (rev 43573)
@@ -390,7 +390,7 @@
} else if ( vert->trb &&
vert->brb &&
(box ==
vert->trb || box == vert->brb) ) {
if (vert->trb->w >
vert->brb->w) {
-
vert->brb->v[TR]->free &= ~(TRF|TRF);
+
vert->brb->v[TR]->free &= ~(TLF|TRF);
} else if (vert->trb->w
< vert->brb->w) {
vert->trb->v[BR]->free &= ~(BLF|BRF);
} else { /*same*/
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
