diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-20 17:45:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-20 17:45:38 +0400 |
| commit | ed81982049987802b0215dc1b49439addbb9f0b3 (patch) | |
| tree | a83ee34c2b617e3f4d60006e1ee87889b5063798 /source/blender/bmesh | |
| parent | 71ac500fc2bc675ab34b91759c0712854fe7ee8c (diff) | |
knife tool alpha values where being set to zero (intersection points weren't visible), error made when converting to theme colors.
also minor bmesh style cleanup.
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 18 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_queries.c | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 51ca11b0898..3457d295bdc 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -658,9 +658,9 @@ static int bm_loop_length(BMLoop *l) */ static int bm_loop_reverse_loop(BMesh *bm, BMFace *f #ifdef USE_BMESH_HOLES - , BMLoopList *lst + , BMLoopList *lst #endif - ) + ) { #ifdef USE_BMESH_HOLES @@ -775,7 +775,7 @@ static void bm_elements_systag_disable(void *veles, int tot, int flag) } } -#define FACE_MARK (1 << 10) +#define FACE_MARK (1 << 10) static int count_flagged_radial(BMesh *bm, BMLoop *l, int flag) { @@ -1173,17 +1173,17 @@ BMFace *bmesh_sfme(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2, l_iter = l_first = f1loop; first_loop_f1 = 0; do { - if(l_iter == f->l_first) + if (l_iter == f->l_first) first_loop_f1 = 1; } while ((l_iter = l_iter->next) != l_first); - if(first_loop_f1) { + if (first_loop_f1) { /* original first loop was in f1, find a suitable first loop for f2 which is as similar as possible to f1. the order matters for tools such as duplifaces. */ - if(f->l_first->prev == f1loop) + if (f->l_first->prev == f1loop) f2->l_first = f2loop->prev; - else if(f->l_first->next == f1loop) + else if (f->l_first->next == f1loop) f2->l_first = f2loop->next; else f2->l_first = f2loop; @@ -1192,9 +1192,9 @@ BMFace *bmesh_sfme(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2, /* original first loop was in f2, further do same as above */ f2->l_first = f->l_first; - if(f->l_first->prev == f2loop) + if (f->l_first->prev == f2loop) f->l_first = f1loop->prev; - else if(f->l_first->next == f2loop) + else if (f->l_first->next == f2loop) f->l_first = f1loop->next; else f->l_first = f1loop; diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c index 3561092b1cf..37935f33521 100644 --- a/source/blender/bmesh/intern/bmesh_queries.c +++ b/source/blender/bmesh/intern/bmesh_queries.c @@ -550,7 +550,7 @@ int BM_vert_is_manifold(BMVert *v) return FALSE; } len++; - } while((e = bmesh_disk_edge_next(e, v)) != oe); + } while ((e = bmesh_disk_edge_next(e, v)) != oe); count = 1; flag = 1; |