forked from bartvdbraak/blender
Code cleanup: warnings (clang)
This commit is contained in:
parent
90d4bb1403
commit
8d1b289b78
@ -37,6 +37,9 @@
|
|||||||
# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 /* gcc4.8+ only (behavior changed to ignore globals)*/
|
# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 /* gcc4.8+ only (behavior changed to ignore globals)*/
|
||||||
# pragma GCC diagnostic error "-Wshadow"
|
# pragma GCC diagnostic error "-Wshadow"
|
||||||
# endif
|
# endif
|
||||||
|
# ifdef __clang__ /* pedantic causes clang error */
|
||||||
|
# pragma GCC diagnostic ignored "-Wlanguage-extension-token"
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
|
@ -3764,7 +3764,7 @@ static void do_projectpaint_draw(ProjPaintState *ps, ProjPixel *projPixel, const
|
|||||||
}
|
}
|
||||||
|
|
||||||
rgb_float_to_uchar(rgba_ub, rgb);
|
rgb_float_to_uchar(rgba_ub, rgb);
|
||||||
rgba_ub[3] = FTOCHAR(mask);
|
rgba_ub[3] = f_to_char(mask);
|
||||||
|
|
||||||
if (ps->do_masking) {
|
if (ps->do_masking) {
|
||||||
IMB_blend_color_byte(projPixel->pixel.ch_pt, projPixel->origColor.ch, rgba_ub, ps->blend);
|
IMB_blend_color_byte(projPixel->pixel.ch_pt, projPixel->origColor.ch, rgba_ub, ps->blend);
|
||||||
|
Loading…
Reference in New Issue
Block a user