From 40a25f859aaf13800f2b28026b21b1225002c129 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sun, 3 Jan 2016 08:00:23 -0800 Subject: [PATCH] cleanups --- libraries/entities/src/EntityItem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 7a2d01053c..2f15fa7293 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -1310,7 +1310,7 @@ bool EntityItem::contains(const glm::vec3& point) const { if (getShapeType() == SHAPE_TYPE_COMPOUND) { bool success; bool result = getAABox(success).contains(point); - return result & success; + return result && success; } else { ShapeInfo info; info.setParams(getShapeType(), glm::vec3(0.5f));