Merge pull request #5753 from johnhaddon/anotherShutdownCrash

SceneAlgo : Don't destroy adaptor registry at shutdown
GafferHQ · Mar 28, 2024 · cb895ad · cb895ad
2 parents ba55238 + b6e12bd
commit cb895ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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 )
 {