mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-14 07:49:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop

Browse Source
This commit is contained in:
Alexander Bock
2016-08-01 09:39:49 +02:00
parent 93b30f5078 c159e027ee
commit 48b5ae9166
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/engine/openspaceengine.cpp
View File

@@ -817,14 +817,13 @@ void OpenSpaceEngine::postDraw() {
bool showGui = _windowWrapper->hasGuiWindow() ? _windowWrapper->isGuiWindow() : true;
if (showGui) {
_renderEngine->renderScreenLog();
if (_console->isVisible())
_console->render();
#ifdef OPENSPACE_MODULE_ONSCREENGUI_ENABLED
if (_gui->isEnabled())
if (_gui->isEnabled() && _isMaster && _windowWrapper->isRegularRendering())
_gui->endFrame();
}
#endif
}
if (_isInShutdownMode)
_renderEngine->renderShutdownInformation(_shutdownCountdown, _shutdownWait);