From ddee0931b8687d01186f1941d483c6b3622d1833 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 1 Jul 2018 15:47:09 +0200 Subject: RNA: use bool for boolean RNA types We were using int's for bool arguments in BKE, just to avoid having wrapper functions. --- intern/cycles/blender/blender_util.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'intern/cycles/blender/blender_util.h') diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index 5176f9c3b50..7e61888348b 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -293,7 +293,7 @@ static inline int4 get_int4(const BL::Array& array) return make_int4(array[0], array[1], array[2], array[3]); } -static inline uint get_layer(const BL::Array& array) +static inline uint get_layer(const BL::Array& array) { uint layer = 0; @@ -304,8 +304,8 @@ static inline uint get_layer(const BL::Array& array) return layer; } -static inline uint get_layer(const BL::Array& array, - const BL::Array& local_array, +static inline uint get_layer(const BL::Array& array, + const BL::Array& local_array, bool is_light = false, uint scene_layers = (1 << 20) - 1) { -- cgit v1.2.3