mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-27 22:40:41 -05:00
Fix bugs from merge
This commit is contained in:
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user