mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-19 10:21:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/general-performance

Browse Source 
# Conflicts:
#	apps/OpenSpace/main.cpp
#	modules/server/src/topics/timetopic.cpp
This commit is contained in:
Alexander Bock
2020-09-04 13:49:00 +02:00
parent b99a4c7390 20d1e391cb
commit 00a00c9cc8
18 changed files with 289 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/engine/openspaceengine.cpp
View File

@@ -997,10 +997,7 @@ void OpenSpaceEngine::loadFonts() {
}
try {
bool initSuccess = ghoul::fontrendering::FontRenderer::initialize();
if (!initSuccess) {
LERROR("Error initializing default font renderer");
}
ghoul::fontrendering::FontRenderer::initialize();
}
catch (const ghoul::RuntimeError& err) {
LERRORC(err.component, err.message);