From 559e1434d847681a4e72144489b68fee650ab9a8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 2 Aug 2015 13:54:06 +1000 Subject: parenthisize macro args to avoid errors --- source/blender/render/intern/raytrace/rayobject_octree.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/render') diff --git a/source/blender/render/intern/raytrace/rayobject_octree.cpp b/source/blender/render/intern/raytrace/rayobject_octree.cpp index 6cbb0761358..b21197e728d 100644 --- a/source/blender/render/intern/raytrace/rayobject_octree.cpp +++ b/source/blender/render/intern/raytrace/rayobject_octree.cpp @@ -119,7 +119,8 @@ static RayObjectAPI octree_api = /* within one octree node, a set of 3x15 bits defines a 'boundbox' to OR with */ #define OCVALRES 15 -#define BROW16(min, max) (((max) >= OCVALRES ? 0xFFFF : (1 << (max + 1)) - 1) - ((min > 0) ? ((1 << (min)) - 1) : 0)) +#define BROW16(min, max) \ + (((max) >= OCVALRES ? 0xFFFF : (1 << ((max) + 1)) - 1) - (((min) > 0) ? ((1 << (min)) - 1) : 0)) static void calc_ocval_face(float *v1, float *v2, float *v3, float *v4, short x, short y, short z, OcVal *ov) { -- cgit v1.2.3