diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-11 02:00:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-11 02:00:55 +0400 |
| commit | 7f34653f59ad3f7bed75eb9a36aa6ed928eef181 (patch) | |
| tree | 999e7d6a234780e854bcdc20f440a9b7f1ec13b5 /source/blender/editors/space_view3d/drawmesh.c | |
| parent | 67f1e83508ac1312b6b41093cb1946363ce3d0fd (diff) | |
style cleanup: + some warning fixes, also remove unused metaelem extern.
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 651b0edb123..c69879fcd32 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -404,7 +404,7 @@ static DMDrawOption draw_tface__set_draw_legacy(MTFace *tface, int has_mcol, int glColor3ub(0xFF, 0x00, 0xFF); return DM_DRAW_OPTION_NO_MCOL; /* Don't set color */ } - else if (ma && ma->shade_flag&MA_OBCOLOR) { + else if (ma && (ma->shade_flag&MA_OBCOLOR)) { glColor3ubv(Gtexdraw.obcol); return DM_DRAW_OPTION_NO_MCOL; /* Don't set color */ } @@ -444,7 +444,7 @@ static DMDrawOption draw_tface__set_draw(MTFace *tface, int has_mcol, int matnr) if (tface && set_draw_settings_cached(0, tface, ma, Gtexdraw)) { return DM_DRAW_OPTION_NO_MCOL; /* Don't set color */ } - else if (tface && tface->mode&TF_OBCOL) { + else if (tface && (tface->mode & TF_OBCOL)) { return DM_DRAW_OPTION_NO_MCOL; /* Don't set color */ } else if (!has_mcol) { @@ -486,7 +486,7 @@ static void add_tface_color_layer(DerivedMesh *dm) finalCol[i*4+j].r = 255; } } - else if (tface && tface->mode&TF_OBCOL) { + else if (tface && (tface->mode & TF_OBCOL)) { for (j=0;j<4;j++) { finalCol[i*4+j].b = FTOCHAR(Gtexdraw.obcol[0]); finalCol[i*4+j].g = FTOCHAR(Gtexdraw.obcol[1]); |