diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-04-12 04:26:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-04-12 04:26:06 +0300 |
| commit | 4a64b36029872034c9c138738010ced47b48e045 (patch) | |
| tree | 4880dd52734a808c94cb74f69cc7a58a2855c584 /source/blender/render | |
| parent | a2db16ba58a16be246f7f018ee78918d9c8a8aff (diff) | |
Cleanup: use bool
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/bake.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/rayshade.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/bake.c b/source/blender/render/intern/source/bake.c index b2f8c79c197..31e461b4536 100644 --- a/source/blender/render/intern/source/bake.c +++ b/source/blender/render/intern/source/bake.c @@ -926,7 +926,7 @@ static void *do_bake_thread(void *bs_v) void RE_bake_ibuf_filter(ImBuf *ibuf, char *mask, const int filter) { /* must check before filtering */ - const short is_new_alpha = (ibuf->planes != R_IMF_PLANES_RGBA) && BKE_imbuf_alpha_test(ibuf); + const bool is_new_alpha = (ibuf->planes != R_IMF_PLANES_RGBA) && BKE_imbuf_alpha_test(ibuf); /* Margin */ if (filter) { diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index 0f77cd9768d..9aac5ed1f1d 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -184,7 +184,7 @@ void freeraytree(Render *re) #endif } -static int is_raytraceable_vlr(Render *re, VlakRen *vlr) +static bool is_raytraceable_vlr(Render *re, VlakRen *vlr) { /* note: volumetric must be tracable, wire must not */ if ((re->flag & R_BAKE_TRACE) || (vlr->flag & R_TRACEBLE) || (vlr->mat->material_type == MA_TYPE_VOLUME)) @@ -193,7 +193,7 @@ static int is_raytraceable_vlr(Render *re, VlakRen *vlr) return 0; } -static int is_raytraceable(Render *re, ObjectInstanceRen *obi) +static bool is_raytraceable(Render *re, ObjectInstanceRen *obi) { int v; ObjectRen *obr = obi->obr; |