From c14bbb76e63d5ae159ddf27afc16b7511fe52a3b Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 25 Oct 2017 11:57:44 -0700
Subject: [PATCH] fix compile errors after merge

---
 libraries/shared/src/ShapeInfo.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/shared/src/ShapeInfo.cpp b/libraries/shared/src/ShapeInfo.cpp
index fd14a9c251..36ce38335a 100644
--- a/libraries/shared/src/ShapeInfo.cpp
+++ b/libraries/shared/src/ShapeInfo.cpp
@@ -67,7 +67,6 @@ void ShapeInfo::setParams(ShapeType type, const glm::vec3& halfExtents, QString
             break;
         case SHAPE_TYPE_BOX:
         case SHAPE_TYPE_HULL:
-        case SHAPE_TYPE_SIMPLE_HULL:
             break;
         case SHAPE_TYPE_SPHERE: {
                 float radius = glm::length(halfExtents) / SQUARE_ROOT_OF_3;
@@ -361,7 +360,7 @@ const DoubleHashKey& ShapeInfo::getHash() const {
             numHulls = 1;
         }
         if (numHulls > 0) {
-            hash = DoubleHashKey::hashFunction(numHulls, primeIndex++);
+            uint32_t hash = DoubleHashKey::hashFunction(numHulls, primeIndex++);
             _doubleHashKey.setHash(_doubleHashKey.getHash() ^ hash);
             hash = DoubleHashKey::hashFunction2(numHulls);
             _doubleHashKey.setHash2(_doubleHashKey.getHash2() ^ hash);