kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Code cleanup: warnings (clang)

Browse Source
This commit is contained in:
Campbell Barton 2014-03-30 19:37:43 +11:00
parent 90d4bb1403
commit 8d1b289b78
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenlib/BLI_strict_flags.h
View File

@ -37,6 +37,9 @@
# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 /* gcc4.8+ only (behavior changed to ignore globals)*/
# pragma GCC diagnostic error "-Wshadow"
# endif
# ifdef __clang__ /* pedantic causes clang error */
# pragma GCC diagnostic ignored "-Wlanguage-extension-token"
# endif
#endif
#ifdef _MSC_VER

2
source/blender/editors/sculpt_paint/paint_image_proj.c
View File

@ -3764,7 +3764,7 @@ static void do_projectpaint_draw(ProjPaintState *ps, ProjPixel *projPixel, const
}
rgb_float_to_uchar(rgba_ub, rgb);
rgba_ub[3] = FTOCHAR(mask);
rgba_ub[3] = f_to_char(mask);
if (ps->do_masking) {
IMB_blend_color_byte(projPixel->pixel.ch_pt, projPixel->origColor.ch, rgba_ub, ps->blend);