History

Merge pull request #4389 from birarda/master

render application overlay only if enabled

Brad Hefta-Gaub committed 11 years ago

Commit c9dd96c2 parents fd6f8c7 a4963f11 file · +2 −5Browse files

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

Unified · Split

interface/src/Application.cpp+2−5
@@ -772,13 +772,10 @@ void Application::paintGL() { · 771 unmodified lines
772 772
773 DependencyManager::get<GlowEffect>()->render();773 DependencyManager::get<GlowEffect>()->render();
774 774
775 {775 if (Menu::getInstance()->isOptionChecked(MenuOption::UserInterface)) {
776 PerformanceTimer perfTimer("renderOverlay");776 PerformanceTimer perfTimer("renderOverlay");
777 // PrioVR will only work if renderOverlay is called, calibration is connected to Application::renderingOverlay()
778 _applicationOverlay.renderOverlay(true);777 _applicationOverlay.renderOverlay(true);
779 if (Menu::getInstance()->isOptionChecked(MenuOption::UserInterface)) {778 _applicationOverlay.displayOverlayTexture();
780 _applicationOverlay.displayOverlayTexture();
781 }
782 }779 }
783 }780 }
784 781

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t