diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-08-02 06:54:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-02 06:54:06 +0300 |
| commit | 559e1434d847681a4e72144489b68fee650ab9a8 (patch) | |
| tree | d91e78881de0e24c837c1a399d50aac3d5d397ff /source/blender/render | |
| parent | a4f55617d1ae803efa7266ae0a3746b79dfb1f3a (diff) | |
parenthisize macro args to avoid errors
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/raytrace/rayobject_octree.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |