From b6e12bdb7c1f70a1287fcb24a327ba695da8dd9a Mon Sep 17 00:00:00 2001
From: John Haddon <thehaddonyoof@gmail.com>
Date: Tue, 26 Mar 2024 12:39:57 +0000
Subject: [PATCH] SceneAlgo : Don't destroy adaptor registry at shutdown

It contains Python-implemented adaptors, and Python doesn't take kindly to us deleting Python objects after Python has been shut down.
---
 Changes.md                    | 1 +
 src/GafferScene/SceneAlgo.cpp | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Changes.md b/Changes.md
index 57be22581ad..2f03ecabacb 100644
--- a/Changes.md
+++ b/Changes.md
@@ -5,6 +5,7 @@ Fixes
 -----
 
 - GafferTest, GafferImageTest : Fixed import of these modules if the `Gaffer` module had not been imported previously.
+- SceneAlgo : Fixed potential shutdown crashes caused by the adaptor registry.
 
 1.4.0.0b5 (relative to 1.4.0.0b4)
 =========
diff --git a/src/GafferScene/SceneAlgo.cpp b/src/GafferScene/SceneAlgo.cpp
index d76bbc1eddf..8f1f66606c4 100644
--- a/src/GafferScene/SceneAlgo.cpp
+++ b/src/GafferScene/SceneAlgo.cpp
@@ -1331,11 +1331,11 @@ using RenderAdaptors = boost::container::flat_map<string, SceneAlgo::RenderAdapt
 
 RenderAdaptors &renderAdaptors()
 {
-	static RenderAdaptors a;
-	return a;
+	static RenderAdaptors *a = new RenderAdaptors;
+	return *a;
 }
 
-}
+} // namespace
 
 void GafferScene::SceneAlgo::registerRenderAdaptor( const std::string &name, SceneAlgo::RenderAdaptor adaptor )
 {