diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-13 00:39:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-13 00:39:39 +0400 |
| commit | 9892736206676c5b7fabc8d1184f9655511ff2dd (patch) | |
| tree | 83562ac50c93fe3004959d35c1af4a5b380fdd97 /source/blender/blenlib/BLI_scanfill.h | |
| parent | cffaa42d3a34c6b310c3c87c98e1f8313881e473 (diff) | |
code cleanup: header cleanup and remove some duplicate defines.
Diffstat (limited to 'source/blender/blenlib/BLI_scanfill.h')
| -rw-r--r-- | source/blender/blenlib/BLI_scanfill.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/source/blender/blenlib/BLI_scanfill.h b/source/blender/blenlib/BLI_scanfill.h index 081d5ccfb66..ceef378358b 100644 --- a/source/blender/blenlib/BLI_scanfill.h +++ b/source/blender/blenlib/BLI_scanfill.h @@ -41,8 +41,7 @@ struct ScanFillVert; extern "C" { #endif -typedef struct ScanFillContext -{ +typedef struct ScanFillContext { ListBase fillvertbase; ListBase filledgebase; ListBase fillfacebase; @@ -61,13 +60,12 @@ typedef struct ScanFillContext } ScanFillContext; /* note; changing this also might affect the undo copy in editmesh.c */ -typedef struct ScanFillVert -{ +typedef struct ScanFillVert { struct ScanFillVert *next, *prev; union { struct ScanFillVert *v; void *p; - intptr_t l; + intptr_t l; } tmp; float co[3]; /* vertex location */ float xy[2]; /* 2D copy of vertex location (using dominant axis) */ @@ -76,16 +74,14 @@ typedef struct ScanFillVert unsigned char f, h; } ScanFillVert; -typedef struct ScanFillEdge -{ +typedef struct ScanFillEdge { struct ScanFillEdge *next, *prev; struct ScanFillVert *v1, *v2; short poly_nr; unsigned char f; } ScanFillEdge; -typedef struct ScanFillFace -{ +typedef struct ScanFillFace { struct ScanFillFace *next, *prev; struct ScanFillVert *v1, *v2, *v3; } ScanFillFace; @@ -97,7 +93,7 @@ struct ScanFillEdge *BLI_scanfill_edge_add(ScanFillContext *sf_ctx, struct ScanF int BLI_scanfill_begin(ScanFillContext *sf_ctx); int BLI_scanfill_calc(ScanFillContext *sf_ctx, const short do_quad_tri_speedup); int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const short do_quad_tri_speedup, - const float nor_proj[3]); + const float nor_proj[3]); void BLI_scanfill_end(ScanFillContext *sf_ctx); /* These callbacks are needed to make the lib finction properly */ @@ -108,7 +104,7 @@ void BLI_scanfill_end(ScanFillContext *sf_ctx); * \param f The function to use as callback * \attention used in creator.c */ -void BLI_setErrorCallBack(void (*f)(const char*)); +void BLI_setErrorCallBack(void (*f)(const char *)); /** * Set a function to be able to interrupt the execution of processing |