Fix

Author: ChunkTreasure1

Engine/Source/Sandbox/Private/Sandbox/DebugRendering.cpp

@@ -23,13 +23,24 @@ void Sandbox::DrawEntityGizmos()
 
 	const auto& settings = UserSettingsManager::GetSettings().sceneSettings;
 
-	if (!settings.showGizmos || !m_runtimeScene || !m_runtimeScene->IsFinishedLoadingEntities())
+	AssetReference<Volt::Scene> tempScene;
+
+	if (m_sceneState == SceneState::Edit)
+	{
+		tempScene = m_runtimeScene;
+	}
+	else
+	{
+		tempScene = m_intermediateScene;
+	}
+
+	if (!settings.showGizmos || !tempScene || !tempScene->IsFinishedLoadingEntities())
 	{
 		return;
 	}
 
 	// There will be one gizmo per entity.
-	const entt::registry& registry = m_runtimeScene->GetEntityScene().GetRegistry();
+	const entt::registry& registry = tempScene->GetEntityScene().GetRegistry();
 	auto entityView = registry.view<Volt::IDComponent>();
 
 	const uint32_t numEntities = static_cast<uint32_t>(entityView.size());
@@ -41,7 +52,7 @@ void Sandbox::DrawEntityGizmos()
 			&entityView, 
 			&editorCameraPosition, 
 			&editorCameraViewMatrix, 
-			scene = m_runtimeScene, 
+			scene = tempScene,
 			&debugRenderer = m_debugRenderer, 
 			&visProxyContextManagersMutex = m_visProxyContextManagersMutex,
 			&visProxyContextManagers = m_visProxyContextManagers

Engine/Source/Sandbox/Private/Sandbox/Sandbox.cpp

@@ -517,6 +517,8 @@ void Sandbox::OpenScene(Volt::AssetHandle sceneHandle)
 
 	SelectionManager::DeselectAll();
 
+	UnloadActiveScene();
+
 	//load new scene
 	{
 		Volt::SceneContainer* newSceneContainer = m_sceneManager->LoadScene(sceneHandle);
@@ -531,11 +533,6 @@ void Sandbox::OpenScene(Volt::AssetHandle sceneHandle)
 			return;
 		}
 
-		if (m_sceneContainer)
-		{
-			m_sceneManager->UnloadAndFreeScene(m_sceneContainer);
-		}
-
 		m_sceneContainer = newSceneContainer;
 		m_runtimeScene = newSceneContainer->GetScene();
 	}
@@ -580,6 +577,17 @@ bool Sandbox::SaveScene(bool showDialog, bool allowDiscard)
 	return DirtyAssetsManager::Get().SaveAssets(showDialog, allowDiscard, filter);
 }
 
+void Sandbox::UnloadActiveScene()
+{
+	m_sceneRenderer = nullptr;
+	m_gameSceneRenderer = nullptr;
+
+	if (m_sceneContainer)
+	{
+		m_sceneManager->UnloadAndFreeScene(m_sceneContainer);
+	}
+}
+
 void Sandbox::RegisterEventListeners()
 {
 	auto isInitializedPred = [this]() { return m_isInitialized; };
@@ -611,7 +619,6 @@ bool Sandbox::PromptUnloadCurrentScene()
 		return false;
 	}
 
-
 	m_runtimeScene->UnloadEntities();
 	m_runtimeScene.Reset();
 

Engine/Source/Sandbox/Public/Sandbox/Sandbox.h

@@ -92,6 +92,7 @@ class Sandbox : public Volt::ApplicationLayer, public Volt::EventListener
 	void OpenScene(Volt::AssetHandle sceneHandle);
 	//returns false if user cancels save
 	bool SaveScene(bool showDialog = false, bool allowDiscard = false);
+	void UnloadActiveScene();
 
 private:
 	struct SaveSceneAsData