diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-26 00:20:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-26 00:20:39 +0200 |
| commit | 9ef46996cdd94a596b9b4873c829393caf9e9974 (patch) | |
| tree | f15f770f53082296549aa80a4a2e9b5c6d6f5f4f | |
| parent | 77f576e2a1e133df03f09108d1047d6967d8e5d7 (diff) | |
| parent | fc65cc64b92d1663cf858f3c6cf4f039c2da67e8 (diff) | |
Merge pull request #28430 from AnthonyYoManz/issue-28186-fix-crash-on-exit-when-3d-disabled
Fix Crash On Close When 3D Is Disabled
| -rw-r--r-- | scene/register_scene_types.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 9face3e476..47f5b152f0 100644 --- 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(); |