griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

knife tool alpha values where being set to zero (intersection points weren't visible), error made when converting to theme colors.

Browse Source 
also minor bmesh style cleanup.
This commit is contained in:
Campbell Barton
2012-04-20 13:45:38 +00:00
parent 71ac500fc2
commit ed81982049
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/bmesh/intern/bmesh_core.c
View 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;

2
source/blender/bmesh/intern/bmesh_queries.c
View 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;

4
source/blender/editors/mesh/editmesh_knife.c
View 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 */