History

Merge branch 'plugins_pt2' into plugins

Bradley Austin Davis committed 11 years ago

Commit 9f8a3842 parents 5f12af7 03bd17e10 files · +132 −161Browse files

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

Unified · Split

interface/src/Application.cpp+6−5
@@ -821,6 +821,11 @@ void Application::paintGL() { · 820 unmodified lines
821821 resizeGL();
822822 Q_ASSERT(_offscreenContext->getContext() == QOpenGLContext::currentContext());
823823
824+ {
825+ PerformanceTimer perfTimer("renderOverlay");
826+ _applicationOverlay.renderOverlay();
827+ }
828+
824829 glEnable(GL_LINE_SMOOTH);
825830
826831 if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) {
@@ -892,10 +897,6 @@ void Application::paintGL() { · 65 unmodified lines
892897 }
893898
894899 finalFbo = DependencyManager::get<GlowEffect>()->render();
895− {
896− PerformanceTimer perfTimer("renderOverlay");
897− _applicationOverlay.renderOverlay();
898− }
899900 }
900901
901902 // This might not be needed *right now*. We want to ensure that the FBO rendering
@@ -4681,4 +4682,4 @@ void Application::shutdownPlugins() { · 3779 unmodified lines
46814682
46824683 glm::ivec2 Application::getMouse() const {
46834684 return getActiveDisplayPlugin()->getUiMousePosition();
4684−}
4685+}

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