Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

This commit is contained in:
Emil Axelsson
2017-11-05 20:04:47 +01:00
16 changed files with 6260 additions and 12 deletions

View File

@@ -1170,6 +1170,12 @@ void OpenSpaceEngine::postDraw() {
if (isGuiWindow) {
_renderEngine->renderScreenLog();
_renderEngine->renderVersionInformation();
if (!_shutdown.inShutdown) {
// We render the camera information in the same location as the shutdown info
// and we won't need this if we are shutting down
_renderEngine->renderCameraInformation();
}
_console->render();
}