diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-11-12 15:48:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-11-12 15:48:39 +0300 |
| commit | 4f47f21d446cc6b927939507b00e1299c3ce6b01 (patch) | |
| tree | 38ad128171d533c0fd977f43f50f1ded172309cd /source/blender/blenlib/intern/boxpack2d.c | |
| parent | 9596b369bd32e9d5553d467cf61495fade1d6031 (diff) | |
small corrections, no functionality change
Diffstat (limited to 'source/blender/blenlib/intern/boxpack2d.c')
| -rw-r--r-- | source/blender/blenlib/intern/boxpack2d.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenlib/intern/boxpack2d.c b/source/blender/blenlib/intern/boxpack2d.c index 7d5e1eec53e..d31bc4e762d 100644 --- a/source/blender/blenlib/intern/boxpack2d.c +++ b/source/blender/blenlib/intern/boxpack2d.c @@ -31,7 +31,7 @@ * The defined Below are for internal use only */ /* free vert flags */ -#define eul 0.0000001f +#define eps 0.0000001f #define BLF 1 #define TRF 2 #define TLF 4 @@ -68,10 +68,10 @@ b->v[TR]->y = f;\ UPDATE_V34Y(b) #define BOXINTERSECT(b1, b2)\ - (!( BOXLEFT(b1)+eul>=BOXRIGHT(b2) ||\ - BOXBOTTOM(b1)+eul>=BOXTOP(b2) ||\ - BOXRIGHT(b1)-eul<=BOXLEFT(b2) ||\ - BOXTOP(b1)-eul<=BOXBOTTOM(b2) )) + (!( BOXLEFT(b1)+eps>=BOXRIGHT(b2) ||\ + BOXBOTTOM(b1)+eps>=BOXTOP(b2) ||\ + BOXRIGHT(b1)-eps<=BOXLEFT(b2) ||\ + BOXTOP(b1)-eps<=BOXBOTTOM(b2) )) #define MIN2(x,y) ( (x)<(y) ? (x) : (y) ) #define MAX2(x,y) ( (x)>(y) ? (x) : (y) ) |