More merge bugs

This commit is contained in:
Brad Davis 2015-06-18 12:44:57 -07:00
parent 0cdee2d6ec
commit 1243c54767

View file

@ -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