From 96f512484bec06683fc5eae70cd2a1cda8a86e3b Mon Sep 17 00:00:00 2001 From: Emil Axelsson Date: Wed, 1 Nov 2017 14:54:03 +0100 Subject: [PATCH] Asset loading fix on mac --- src/engine/openspaceengine.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 6f6a0bfa77..88b0241ca5 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -165,6 +165,8 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName, properties::StringProperty(VersionInfo, OPENSPACE_VERSION_STRING_FULL), properties::StringProperty(SourceControlInfo, OPENSPACE_GIT_FULL) } + , _hasScheduledAssetLoading(false) + , _scheduledAssetPathToLoad("") , _shutdown({false, 0.f, 0.f}) , _isFirstRenderingFirstFrame(true) { @@ -562,6 +564,7 @@ void OpenSpaceEngine::initialize() { } void OpenSpaceEngine::scheduleLoadSingleAsset(std::string assetPath) { + _hasScheduledAssetLoading = true; _scheduledAssetPathToLoad = assetPath; }