From f551ea9f76006489419fa4fb76fc84fc4aea1a9f Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Sun, 31 Jan 2016 17:19:47 -0800
Subject: [PATCH] fixing compilation on mac and a glsl error on mac

---
 libraries/render/src/render/Scene.cpp       | 4 ++--
 libraries/render/src/render/SceneOctree.slh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/render/src/render/Scene.cpp b/libraries/render/src/render/Scene.cpp
index 78defa4c81..b05f145a49 100644
--- a/libraries/render/src/render/Scene.cpp
+++ b/libraries/render/src/render/Scene.cpp
@@ -130,7 +130,7 @@ void Scene::processPendingChangesQueue() {
 
 void Scene::resetItems(const ItemIDs& ids, Payloads& payloads) {
 
-    auto& resetPayload = payloads.begin();
+    auto resetPayload = payloads.begin();
     for (auto resetID : ids) {
         // Access the true item
         auto& item = _items[resetID];
@@ -171,7 +171,7 @@ void Scene::removeItems(const ItemIDs& ids) {
 
 void Scene::updateItems(const ItemIDs& ids, UpdateFunctors& functors) {
 
-    auto& updateFunctor = functors.begin();
+    auto updateFunctor = functors.begin();
     for (auto updateID : ids) {
         // Access the true item
         auto& item = _items[updateID];
diff --git a/libraries/render/src/render/SceneOctree.slh b/libraries/render/src/render/SceneOctree.slh
index d3fa36cf0f..b8a179b64d 100644
--- a/libraries/render/src/render/SceneOctree.slh
+++ b/libraries/render/src/render/SceneOctree.slh
@@ -60,7 +60,7 @@ float getInvDepthDimension(int depth) { return INV_DEPTH_DIM[depth]; }
 float getCellWidth(int depth) { return _size * getInvDepthDimension(depth); }
 float getInvCellWidth(int depth) { return getDepthDimensionf(depth) * _invSize; }
 
-vec3 evalPos(ivec3 coord, int depth = MAX_DEPTH) {
+vec3 evalPos(ivec3 coord, int depth) {
     return getOrigin() + vec3(coord) * getCellWidth(depth);
 }
 vec3 evalPosDepthWidth(ivec3 coord, float cellWidth) {