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

Merge branch 'master' into thesis/2019/camera-paths

Browse Source 
# Conflicts:
#	src/navigation/navigationhandler.cpp
This commit is contained in:
Emma Broman
2021-06-23 16:31:14 +02:00
parent 200cb1181e bf34c3a016
commit 8063b54fb8
112 changed files with 1007 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/openspaceengine.cpp
View File

@@ -154,7 +154,7 @@ void OpenSpaceEngine::registerPathTokens() {
using T = std::string;
for (const std::pair<const T, T>& path : global::configuration->pathTokens) {
std::string fullKey = "${" + path.first + "}";
LDEBUG(fmt::format("Registering path {}: {}", fullKey, path.second));
LDEBUG(fmt::format("Registering path '{}': '{}'", fullKey, path.second));
const bool overrideBase = (fullKey == "${BASE}");
if (overrideBase) {