Merge pull request #28430 from AnthonyYoManz/issue-28186-fix-crash-on-exit-when-3d-disabled

Fix Crash On Close When 3D Is Disabled

Merge pull request #28430 from AnthonyYoManz/issue-28186-fix-crash-on-exit-when-3d-disabled
9ef46996 · Rémi Verschelde · GitHub · 77f576e2 · fc65cc64 · 9ef46996
Unverified Commit 9ef46996 authored Apr 26, 2019 by Rémi Verschelde Committed by GitHub Apr 26, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

register_scene_types.cpp scene/register_scene_types.cpp +4 -0

No files found.
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -782,7 +782,11 @@ void unregister_scene_types() {
 	ResourceLoader::remove_resource_format_loader(resource_loader_bmfont);
 	resource_loader_bmfont.unref();

+	//SpatialMaterial is not initialised when 3D is disabled, so it shouldn't be cleaned up either
+#ifndef _3D_DISABLED
 	SpatialMaterial::finish_shaders();
+#endif // _3D_DISABLED
+
 	ParticlesMaterial::finish_shaders();
 	CanvasItemMaterial::finish_shaders();
 	SceneStringNames::free();