History

Revert "Merge pull request #5106 from jherico/render_cursor"

This reverts commit 4d18bd7cec710b5188d1f6ad5c58010117d7a77d, reversing changes made to 24fda9a7336e4eff1d1310dd3359dd6cbbb6acb5.

ZappoMan committed 11 years ago

Commit 0cdc2b51 parent a5b286610 files · +467 −325Browse files

Showing the changes to interface/src/Application.cpp (1 of 10 files). Show all

Unified · Split

interface/src/Application.cpp+2−1
@@ -955,7 +955,6 @@ void Application::paintGL() { · 954 unmodified lines
955 glPushMatrix();955 glPushMatrix();
956 glLoadIdentity();956 glLoadIdentity();
957 displaySide(&renderArgs, _myCamera);957 displaySide(&renderArgs, _myCamera);
958 _applicationOverlay.displayOverlayTexture(&renderArgs);
959 glPopMatrix();958 glPopMatrix();
960 959
961 if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {960 if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
@@ -972,6 +971,8 @@ void Application::paintGL() { · 10 unmodified lines
972 0, 0, _glWidget->getDeviceSize().width(), _glWidget->getDeviceSize().height(),971 0, 0, _glWidget->getDeviceSize().width(), _glWidget->getDeviceSize().height(),
973 GL_COLOR_BUFFER_BIT, GL_NEAREST);972 GL_COLOR_BUFFER_BIT, GL_NEAREST);
974 glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);973 glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
974
975 _applicationOverlay.displayOverlayTexture();
975 }976 }
976 977
977 if (!OculusManager::isConnected() || OculusManager::allowSwap()) {978 if (!OculusManager::isConnected() || OculusManager::allowSwap()) {