From 9a3686fc1a3a53d2c0255e1dd2b57df2f5fa2db5 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 22 Mar 2017 14:55:11 -0700
Subject: [PATCH] Fixing merge conflict

---
 libraries/gpu/src/gpu/Texture.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/gpu/src/gpu/Texture.cpp b/libraries/gpu/src/gpu/Texture.cpp
index 872a78fc9c..1f66b2900e 100755
--- a/libraries/gpu/src/gpu/Texture.cpp
+++ b/libraries/gpu/src/gpu/Texture.cpp
@@ -762,7 +762,7 @@ bool sphericalHarmonicsFromTexture(const gpu::Texture& cubeTexture, std::vector<
     for(int face=0; face < gpu::Texture::NUM_CUBE_FACES; face++) {
         PROFILE_RANGE(render_gpu, "ProcessFace");
 
-        auto mipFormat = cubeTexture.accessStoredMipFace(0, face)->getFormat();
+        auto mipFormat = cubeTexture.getStoredMipFormat();
         auto numComponents = mipFormat.getScalarCount();
         int roffset { 0 };
         int goffset { 1 };