From 1243c547671a9fa1ae5664fa1b75ffb56dc7a424 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 18 Jun 2015 12:44:57 -0700
Subject: [PATCH] More merge bugs

---
 interface/src/devices/OculusManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/devices/OculusManager.cpp b/interface/src/devices/OculusManager.cpp
index 3686143bdc..84469f8b29 100644
--- a/interface/src/devices/OculusManager.cpp
+++ b/interface/src/devices/OculusManager.cpp
@@ -709,7 +709,7 @@ void OculusManager::display(QGLWidget * glCanvas, RenderArgs* renderArgs, const
     });
 
     // restore our normal viewport
-    ovrHmd_EndFrame(_ovrHmd, eyeRenderPose, _eyeTextures);
+    ovrHmd_EndFrame(_ovrHmd, _eyeRenderPoses, _eyeTextures);
     glCanvas->makeCurrent();
 #endif