From c340445f33c9342d78a123b57eda481da337e736 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Thu, 4 Sep 2014 17:42:33 -0700
Subject: [PATCH] Hopefully, a fix for the Windows build; looks like "near" is
 a keyword.

---
 interface/src/MetavoxelSystem.cpp | 4 ++--
 interface/src/MetavoxelSystem.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/src/MetavoxelSystem.cpp b/interface/src/MetavoxelSystem.cpp
index bb574f77bc..892efe7211 100644
--- a/interface/src/MetavoxelSystem.cpp
+++ b/interface/src/MetavoxelSystem.cpp
@@ -207,7 +207,7 @@ void MetavoxelSystem::render() {
         glm::vec4 nearClipPlane, farClipPlane;
         Application::getInstance()->computeOffAxisFrustum(
             left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane);
-        program->setUniformValue(locations->near, nearVal);
+        program->setUniformValue(locations->nearLocation, nearVal);
         program->setUniformValue(locations->depthScale, (farVal - nearVal) / farVal);
         float nearScale = -1.0f / nearVal;
         program->setUniformValue(locations->depthTexCoordOffset, left * nearScale, bottom * nearScale);
@@ -630,7 +630,7 @@ void MetavoxelSystem::loadLightProgram(const char* name, ProgramObject& program,
     program.setUniformValue("shadowMap", 3);
     locations.shadowDistances = program.uniformLocation("shadowDistances");
     locations.shadowScale = program.uniformLocation("shadowScale");
-    locations.near = program.uniformLocation("near");
+    locations.nearLocation = program.uniformLocation("near");
     locations.depthScale = program.uniformLocation("depthScale");
     locations.depthTexCoordOffset = program.uniformLocation("depthTexCoordOffset");
     locations.depthTexCoordScale = program.uniformLocation("depthTexCoordScale");
diff --git a/interface/src/MetavoxelSystem.h b/interface/src/MetavoxelSystem.h
index 54bee3d451..f3b9a02117 100644
--- a/interface/src/MetavoxelSystem.h
+++ b/interface/src/MetavoxelSystem.h
@@ -70,7 +70,7 @@ private:
     public:
         int shadowDistances;
         int shadowScale;
-        int near;
+        int nearLocation;
         int depthScale;
         int depthTexCoordOffset;
         int depthTexCoordScale;