godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fix Crash On Close When 3D Is Disabled
This commit is contained in:
Rémi Verschelde 2019-04-26 00:20:39 +02:00 committed by GitHub
parent 77f576e2a1 fc65cc64b9
commit 9ef46996cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/register_scene_types.cpp
View File

@ -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();