Fix bugs from merge

This commit is contained in:
Emil Axelsson
2017-12-17 18:58:24 +01:00
parent d4278f9adc
commit 570a499a59
3 changed files with 8 additions and 3 deletions
+5 -1
View File
@@ -433,7 +433,11 @@ void OpenSpaceEngine::create(int argc, char** argv,
SynchronizationWatcher* rawWatcher = w.get();
_engine->_assetManager = std::make_unique<AssetManager>(
std::make_unique<AssetLoader>(*OsEng.scriptEngine().luaState(), rawWatcher, "${ASSETS}"),
std::make_unique<AssetLoader>(
*OsEng.scriptEngine().luaState(),
rawWatcher,
FileSys.absPath("${ASSETS}")
),
std::move(w)
);
//_engine->_globalPropertyNamespace->addPropertySubOwner(_engine->_assetLoader->rootAsset());