[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45811] trunk/blender/source/blender: knife tool alpha values where being set to zero (intersection points weren 't visible), error made when converting to theme colors.

[Campbell Barton]

Revision: 45811
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45811
Author:   campbellbarton
Date:     2012-04-20 13:45:38 +0000 (Fri, 20 Apr 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_core.c
    trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
    trunk/blender/source/blender/editors/mesh/editmesh_knife.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c	2012-04-20 13:15:57 UTC (rev 45810)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c	2012-04-20 13:45:38 UTC (rev 45811)
@@ -658,9 +658,9 @@
  */
 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 @@
 	}
 }
 
-#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 @@
 	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 @@
 		/* 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;

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2012-04-20 13:15:57 UTC (rev 45810)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c	2012-04-20 13:45:38 UTC (rev 45811)
@@ -550,7 +550,7 @@
 			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;

Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c	2012-04-20 13:15:57 UTC (rev 45810)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c	2012-04-20 13:45:38 UTC (rev 45811)
@@ -895,10 +895,10 @@
 	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 */