浏览代码

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

Fix Crash On Close When 3D Is Disabled
Rémi Verschelde 6 年之前
父节点
当前提交
9ef46996cd
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      scene/register_scene_types.cpp

+ 4 - 0
scene/register_scene_types.cpp

@@ -782,7 +782,11 @@ void unregister_scene_types() {
 	ResourceLoader::remove_resource_format_loader(resource_loader_bmfont);
 	ResourceLoader::remove_resource_format_loader(resource_loader_bmfont);
 	resource_loader_bmfont.unref();
 	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();
 	SpatialMaterial::finish_shaders();
+#endif // _3D_DISABLED
+
 	ParticlesMaterial::finish_shaders();
 	ParticlesMaterial::finish_shaders();
 	CanvasItemMaterial::finish_shaders();
 	CanvasItemMaterial::finish_shaders();
 	SceneStringNames::free();
 	SceneStringNames::free();