knife tool alpha values where being set to zero (intersection points weren't visible...
authorCampbell Barton <ideasman42@gmail.com>
Fri, 20 Apr 2012 13:45:38 +0000 (13:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 20 Apr 2012 13:45:38 +0000 (13:45 +0000)
also minor bmesh style cleanup.

source/blender/bmesh/intern/bmesh_core.c
source/blender/bmesh/intern/bmesh_queries.c
source/blender/editors/mesh/editmesh_knife.c

index 51ca11b08981e7ad4a5f74d1754e5b52671d823e..3457d295bdc88ef7354842145b18f8b5505cbc33 100644 (file)
@@ -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;
index 3561092b1cf76c9cae7bb774c96982d97a15800c..37935f3352157e055ea4515fe65b61477f26dfde 100644 (file)
@@ -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;
index 7d0a5423405a3d7634d9ffa5c80aa9fee18d59bc..84d6439688a99a3f78828bb6c72b76a1d93d4b17 100644 (file)
@@ -895,10 +895,10 @@ static void knife_init_colors(KnifeColors *colors)
        UI_GetThemeColor3ubv(TH_NURB_ULINE, colors->edge);
        UI_GetThemeColor3ubv(TH_HANDLE_SEL_VECT, colors->curpoint);
        UI_GetThemeColor3ubv(TH_HANDLE_SEL_VECT, colors->curpoint_a);
-       colors->curpoint_a[3] = 0.4;
+       colors->curpoint_a[3] = 102;
        UI_GetThemeColor3ubv(TH_ACTIVE_SPLINE, colors->point);
        UI_GetThemeColor3ubv(TH_ACTIVE_SPLINE, colors->point_a);
-       colors->point_a[3] = 0.4;
+       colors->point_a[3] = 102;
 }
 
 /* modal loop selection drawing callback */