diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-13 12:09:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-13 12:12:28 +0400 |
| commit | ae8327dbf3afcdb6a6a0335aceeaa58600d7f1d3 (patch) | |
| tree | 79ee11570a6ebb3d0ce27aa35e524c0991c17fad /source/blender/blenlib/intern/scanfill.c | |
| parent | c85e66e7fe6d12c8a1b33dec703e9bb342b9953b (diff) | |
Mask: add option to detect self intersections
Diffstat (limited to 'source/blender/blenlib/intern/scanfill.c')
| -rw-r--r-- | source/blender/blenlib/intern/scanfill.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c index c01a4a5c620..0610414b710 100644 --- a/source/blender/blenlib/intern/scanfill.c +++ b/source/blender/blenlib/intern/scanfill.c @@ -38,7 +38,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_callbacks.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_memarena.h" @@ -85,16 +84,6 @@ typedef struct ScanFillVertLink { #define SF_POLY_NEW 0 /* all polys initialized to this */ #define SF_POLY_VALID 1 /* has at least 3 verts */ - -/** - * \note this is USHRT_MAX so incrementing will set to zero - * which happens if callers choose to increment #ScanFillContext.poly_nr before adding each curve. - * Nowhere else in scanfill do we make use of intentional overflow like this. - */ -#define SF_POLY_UNSET USHRT_MAX - - - /* **** FUNCTIONS FOR QSORT *************************** */ @@ -903,7 +892,7 @@ unsigned int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const int flag, const sf_ctx->poly_nr = SF_POLY_UNSET; } - if (flag & BLI_SCANFILL_CALC_HOLES && (poly == 0)) { + if (flag & BLI_SCANFILL_CALC_POLYS && (poly == 0)) { for (eve = sf_ctx->fillvertbase.first; eve; eve = eve->next) { mul_v2_m3v3(eve->xy, mat_2d, eve->co); |