diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-21 02:09:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-21 02:09:30 +0400 |
| commit | 3f1584c758bbb5b5c882794417401d0245df5ccb (patch) | |
| tree | a239c7630252db6784fa2c3e8ed1292a20eaafb9 /source/blender/blenlib/intern/boxpack2d.c | |
| parent | 073ea28d58cb97bbb101d15788afc71df4e8ef78 (diff) | |
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.
Diffstat (limited to 'source/blender/blenlib/intern/boxpack2d.c')
| -rw-r--r-- | source/blender/blenlib/intern/boxpack2d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/boxpack2d.c b/source/blender/blenlib/intern/boxpack2d.c index 073b4b5d0c6..cf18fbd57cd 100644 --- a/source/blender/blenlib/intern/boxpack2d.c +++ b/source/blender/blenlib/intern/boxpack2d.c @@ -390,7 +390,7 @@ void boxPack2D(boxPack *boxarray, const int len, float *tot_width, float *tot_he } 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*/ |