From d6f38e4e018a75458290e3ed26dd80c2cf0af882 Mon Sep 17 00:00:00 2001 From: Daniel Stokes Date: Fri, 21 Jun 2013 06:56:43 +0000 Subject: BGE: fix [#32775] LibFree crashing Used the engine's RemoveScene (which ultimately calls the converter's RemoveScene) instead of the converter's RemoveScene when the converter free a blend file. This handles the scene removal in a safer fashion and solves the crash described in part 2 of the bug report. Part 1 no longer appears to cause a crash. --- source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/gameengine/Converter') diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index 19287c1fd62..5df431db4b3 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -1261,7 +1261,7 @@ bool KX_BlenderSceneConverter::FreeBlendFile(struct Main *maggie) { KX_Scene* scene = scenes->at(scene_idx); if (IS_TAGGED(scene->GetBlenderScene())) { - RemoveScene(scene); // XXX - not tested yet + m_ketsjiEngine->RemoveScene(scene->GetName()); scene_idx--; numScenes--; } -- cgit v1.2.3