Merge remote-tracking branch 'origin/master' into issue/2645

2026-01-06 03:29:44 -06:00 · 2024-03-04 10:55:49 +01:00
parent bdec2da599 041cb5c68b
commit 1ceb3d1f5a
28 changed files with 775 additions and 394 deletions
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -158,7 +158,6 @@ private:

    std::unique_ptr<Scene> _scene;
    std::unique_ptr<AssetManager> _assetManager;
-    bool _shouldAbortLoading = false;
    std::unique_ptr<LoadingScreen> _loadingScreen;
    std::unique_ptr<VersionChecker> _versionChecker;