diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-09-20 05:02:39 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-20 05:02:39 +0400 |
commit | 25c96bc9f348814d50095710c30ddc2776f5bb12 (patch) | |
tree | d462c55b492afaa4e52077475af8af984418c6fc /source/blender/bmesh | |
parent | 5d56a901a8b5f103cc2511941e70f6daa0bd9a3a (diff) |
code cleanup: remove unused macros, commet some which may be useful later - or good to keep for completeness. quieted some warnings and add flags -Wmissing-include-dirs and -Wno-div-by-zero to cmake/gcc
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_create.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_dupe.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_join_triangles.c | 5 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_removedoubles.c | 4 |
5 files changed, 3 insertions, 12 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index f03ce9b8543..ccbbb6f170b 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -836,8 +836,6 @@ static void bm_elements_systag_disable(void *veles, int tot, int flag) } } -#define FACE_MARK (1 << 10) - static int count_flagged_radial(BMesh *bm, BMLoop *l, int flag) { BMLoop *l2 = l; diff --git a/source/blender/bmesh/operators/bmo_create.c b/source/blender/bmesh/operators/bmo_create.c index 4723b631c5f..1567455e354 100644 --- a/source/blender/bmesh/operators/bmo_create.c +++ b/source/blender/bmesh/operators/bmo_create.c @@ -364,8 +364,6 @@ static void init_rotsys(BMesh *bm, EdgeData *edata, VertData *vdata) /* BLI_array_staticdeclare(verts, BM_NGON_STACK_SIZE); */ /* UNUSE */ int i; -#define SIGN(n) ((n) < 0.0f) - BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) { BMIter eiter; float no[3], cent[3]; diff --git a/source/blender/bmesh/operators/bmo_dupe.c b/source/blender/bmesh/operators/bmo_dupe.c index 4d4d7e30a4e..32270007a0b 100644 --- a/source/blender/bmesh/operators/bmo_dupe.c +++ b/source/blender/bmesh/operators/bmo_dupe.c @@ -37,7 +37,7 @@ #define DUPE_INPUT 1 /* input from operator */ #define DUPE_NEW 2 #define DUPE_DONE 4 -#define DUPE_MAPPED 8 +// #define DUPE_MAPPED 8 // UNUSED /** * COPY VERTEX diff --git a/source/blender/bmesh/operators/bmo_join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c index 4d052dd2959..0d8b397110e 100644 --- a/source/blender/bmesh/operators/bmo_join_triangles.c +++ b/source/blender/bmesh/operators/bmo_join_triangles.c @@ -37,11 +37,6 @@ #include "intern/bmesh_operators_private.h" /* own include */ -/* Bitflags for edges */ -#define T2QDELETE 1 -#define T2QCOMPLEX 2 -#define T2QJOIN 4 - /* assumes edges are validated before reaching this poin */ static float measure_facepair(BMVert *v1, BMVert *v2, BMVert *v3, BMVert *v4, float limit) diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index 0caa766c0f0..d3e98dd96c1 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -244,11 +244,11 @@ static int vergaverco(const void *e1, const void *e2) else return 0; } -#define VERT_TESTED 1 +// #define VERT_TESTED 1 // UNUSED #define VERT_DOUBLE 2 #define VERT_TARGET 4 #define VERT_KEEP 8 -#define VERT_MARK 16 +// #define VERT_MARK 16 // UNUSED #define VERT_IN 32 #define EDGE_MARK 1 |