diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-03-30 12:37:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-30 12:37:43 +0400 |
| commit | 8d1b289b78be3fc781aacfc55688a83425f1720e (patch) | |
| tree | ffa2f5cdaf0e58d0d74a33ba7ee872c0fde77911 /source/blender | |
| parent | 90d4bb1403e0cf18200c485e7a0a4516a344745e (diff) | |
Code cleanup: warnings (clang)
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenlib/BLI_strict_flags.h | 3 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenlib/BLI_strict_flags.h b/source/blender/blenlib/BLI_strict_flags.h index ce39078ea73..908d02eb4ad 100644 --- a/source/blender/blenlib/BLI_strict_flags.h +++ b/source/blender/blenlib/BLI_strict_flags.h @@ -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 diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index fc7165ea1f5..bbe99b949ce 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -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); |