From 4cfedf0f654ac41c3a955948cf1eae00c7f1818e Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Sat, 20 Oct 2018 13:34:34 +0200 Subject: [PATCH] Update Ghoul repository Prevent reference after delete of the scene when deinitializing the OpenSpaceEngine --- ext/ghoul | 2 +- ext/sgct | 2 +- src/engine/openspaceengine.cpp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ext/ghoul b/ext/ghoul index e6e209531f..72d2faba17 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit e6e209531fd10c56dcea54b9007852fe3d738771 +Subproject commit 72d2faba17787c832d75cd4de40efd6b0cbb76e8 diff --git a/ext/sgct b/ext/sgct index 4e74b6ba5b..8831533acd 160000 --- a/ext/sgct +++ b/ext/sgct @@ -1 +1 @@ -Subproject commit 4e74b6ba5b074d39af9f9277367dd1f9a6ba3e29 +Subproject commit 8831533acdfee90db5cc18c0d8ef69a3c0dd7e53 diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 4df6c302ed..800b6eb3c6 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -816,6 +816,7 @@ void OpenSpaceEngine::deinitializeGL() { global::openSpaceEngine.assetManager().deinitialize(); global::openSpaceEngine._scene = nullptr; + global::renderEngine.setScene(nullptr); for (const std::function& func : global::callback::deinitializeGL) { func();