diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-06-04 08:28:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-06-04 08:41:27 +0300 |
| commit | 7a0f57cd01d337f6f3a9cf02ecece635551b881d (patch) | |
| tree | 91310121749e6985e9ef63a9013177bd36aceb9a /source/blender/render | |
| parent | 896f08bde8cdb336814cb359be09d7c215ef37bd (diff) | |
Cleanup: clarify order of precedence: &/?
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/raytrace/rayobject_instance.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |