Commit: 2699ababa9dc5f5ffb1c5d269d1bba8a38d361db
Author: Campbell Barton
Date: Sat Dec 1 19:55:37 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB2699ababa9dc5f5ffb1c5d269d1bba8a38d361db
Cleanup: style
===================================================================
M source/blender/editors/gpencil/drawgpencil.c
M source/blender/editors/interface/interface_draw.c
M source/blender/editors/mesh/editmesh_select_similar.c
===================================================================
diff --git a/source/blender/editors/gpencil/drawgpencil.c
b/source/blender/editors/gpencil/drawgpencil.c
index 7f67caf91ca..b447b867313 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -660,8 +660,8 @@ static void gp_draw_stroke_fill(
immUniform2fv("texture_scale", gp_style->texture_scale);
immUniform2fv("texture_offset", gp_style->texture_offset);
immUniform1f("texture_opacity", gp_style->texture_opacity);
- immUniform1i("t_mix", gp_style->flag & GP_STYLE_COLOR_TEX_MIX ? 1 : 0);
- immUniform1i("t_flip", gp_style->flag & GP_STYLE_COLOR_FLIP_FILL ? 1 :
0);
+ immUniform1i("t_mix", (gp_style->flag & GP_STYLE_COLOR_TEX_MIX) != 0);
+ immUniform1i("t_flip", (gp_style->flag & GP_STYLE_COLOR_FLIP_FILL) !=
0);
#if 0 /* GPXX disabled, not used in annotations */
/* image texture */
if ((gp_style->fill_style == GP_STYLE_FILL_STYLE_TEXTURE) ||
(gp_style->flag & GP_STYLE_COLOR_TEX_MIX)) {
diff --git a/source/blender/editors/interface/interface_draw.c
b/source/blender/editors/interface/interface_draw.c
index 8c785f63978..59f8cfdb562 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -628,7 +628,7 @@ void ui_draw_but_TAB_outline(const rcti *rect, float rad,
unsigned char highligh
immAttr3ubv(col, highlight);
/* back to corner left-top */
- immVertex2f(pos, minx, roundboxtype & UI_CNR_TOP_LEFT ? maxy - rad :
maxy);
+ immVertex2f(pos, minx, (roundboxtype & UI_CNR_TOP_LEFT) ? (maxy - rad)
: maxy);
immEnd();
immUnbindProgram();
diff --git a/source/blender/editors/mesh/editmesh_select_similar.c
b/source/blender/editors/mesh/editmesh_select_similar.c
index 89e821c52d8..304d1b81eab 100644
--- a/source/blender/editors/mesh/editmesh_select_similar.c
+++ b/source/blender/editors/mesh/editmesh_select_similar.c
@@ -307,7 +307,6 @@ static int similar_face_select_exec(bContext *C, wmOperator
*op)
float dummy[3] = {perimeter,
0.0f, 0.0f};
BLI_kdtree_insert(tree,
tree_index++, dummy);
break;
- break;
}
case SIMFACE_NORMAL:
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
