From 4c959e8d82cf0cb55040353c05060a8c9d7e6d7a Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 4 Mar 2015 09:17:19 -0800 Subject: [PATCH] More parentheses to address Xcode compiler warnings --- libraries/render-utils/src/GeometryCache.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp index 317b3bd6b9..9ecdfa43e1 100644 --- a/libraries/render-utils/src/GeometryCache.cpp +++ b/libraries/render-utils/src/GeometryCache.cpp @@ -63,8 +63,8 @@ void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm int vertices = slices * (stacks - 1) + 2; int indices = slices * (stacks - 1) * NUM_VERTICES_PER_TRIANGULATED_QUAD; - if (registered && (!_registeredSphereVertices.contains(id) || _lastRegisteredSphereVertices[id] != radiusKey) - || !registered && !_sphereVertices.contains(radiusKey)) { + if ((registered && (!_registeredSphereVertices.contains(id) || _lastRegisteredSphereVertices[id] != radiusKey)) + || (!registered && !_sphereVertices.contains(radiusKey))) { if (registered && _registeredSphereVertices.contains(id)) { _registeredSphereVertices[id].clear(); @@ -127,8 +127,8 @@ void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm } #endif - if (registered && (!_registeredSphereIndices.contains(id) || _lastRegisteredSphereIndices[id] != slicesStacksKey) - || !registered && !_sphereIndices.contains(slicesStacksKey)) { + if ((registered && (!_registeredSphereIndices.contains(id) || _lastRegisteredSphereIndices[id] != slicesStacksKey)) + || (!registered && !_sphereIndices.contains(slicesStacksKey))) { if (registered && _registeredSphereIndices.contains(id)) { _registeredSphereIndices[id].clear(); @@ -213,8 +213,8 @@ void GeometryCache::renderSphere(float radius, int slices, int stacks, const glm } #endif - if (registered && (!_registeredSphereColors.contains(id) || _lastRegisteredSphereColors[id] != colorKey) - || !registered && !_sphereColors.contains(colorKey)) { + if ((registered && (!_registeredSphereColors.contains(id) || _lastRegisteredSphereColors[id] != colorKey)) + || (!registered && !_sphereColors.contains(colorKey))) { if (registered && _registeredSphereColors.contains(id)) { _registeredSphereColors[id].clear();