Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-03-31 07:28:46 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-03-31 07:28:46 +0400
commite8d532f1dde96c40c1407d39260724fcfee0b606 (patch)
tree36264f1310ab0dd9af959d09373e7ad6a5e13126 /source/blender/bmesh/operators
parent2c58e96685e80e4e12dfad56ed3bb51fa3824197 (diff)
style cleanup
Diffstat (limited to 'source/blender/bmesh/operators')
-rw-r--r--source/blender/bmesh/operators/bmo_beautify.c6
-rw-r--r--source/blender/bmesh/operators/bmo_edgenet.c1
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/bmesh/operators/bmo_beautify.c b/source/blender/bmesh/operators/bmo_beautify.c
index b94e047ac95..3e968f9250d 100644
--- a/source/blender/bmesh/operators/bmo_beautify.c
+++ b/source/blender/bmesh/operators/bmo_beautify.c
@@ -156,9 +156,9 @@ static float bm_edge_calc_rotate_beauty(const BMEdge *e)
// printf("%p %p %p %p - %p %p\n", v1, v2, v3, v4, e->l->f, e->l->radial_next->f);
BLI_assert((ELEM3(v1, v2, v3, v4) == false) &&
- (ELEM3(v2, v1, v3, v4) == false) &&
- (ELEM3(v3, v1, v2, v4) == false) &&
- (ELEM3(v4, v1, v2, v3) == false));
+ (ELEM3(v2, v1, v3, v4) == false) &&
+ (ELEM3(v3, v1, v2, v4) == false) &&
+ (ELEM3(v4, v1, v2, v3) == false));
is_zero_a = area_tri_v3(v2, v3, v4) <= FLT_EPSILON;
is_zero_b = area_tri_v3(v2, v4, v1) <= FLT_EPSILON;
diff --git a/source/blender/bmesh/operators/bmo_edgenet.c b/source/blender/bmesh/operators/bmo_edgenet.c
index 124579c837e..a4af570ded0 100644
--- a/source/blender/bmesh/operators/bmo_edgenet.c
+++ b/source/blender/bmesh/operators/bmo_edgenet.c
@@ -45,7 +45,6 @@
#define FACE_NEW 1
#define ELE_NEW 1
-#define ELE_OUT 2
#define ELE_ORIG 4
#define FACE_IGNORE 16