From 7a0f57cd01d337f6f3a9cf02ecece635551b881d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 4 Jun 2015 15:28:26 +1000 Subject: Cleanup: clarify order of precedence: &/? --- source/blender/render/intern/raytrace/rayobject_instance.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/render/intern/raytrace/rayobject_instance.cpp') diff --git a/source/blender/render/intern/raytrace/rayobject_instance.cpp b/source/blender/render/intern/raytrace/rayobject_instance.cpp index 01e592cba0c..d080ddcc375 100644 --- a/source/blender/render/intern/raytrace/rayobject_instance.cpp +++ b/source/blender/render/intern/raytrace/rayobject_instance.cpp @@ -197,7 +197,7 @@ static void RE_rayobject_instance_bb(RayObject *o, float *min, float *max) //There must be a faster way than rotating all the 8 vertexs of the BB for (i = 0; i < 8; i++) { - for (j = 0; j < 3; j++) t[j] = i & (1 << j) ? M[j] : m[j]; + for (j = 0; j < 3; j++) t[j] = (i & (1 << j)) ? M[j] : m[j]; mul_m4_v3(obj->target2global, t); DO_MINMAX(t, min, max); } -- cgit v1.2.3