Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stokes <kupomail@gmail.com>2013-06-21 10:56:43 +0400
committerDaniel Stokes <kupomail@gmail.com>2013-06-21 10:56:43 +0400
commitd6f38e4e018a75458290e3ed26dd80c2cf0af882 (patch)
tree147841d2d5f793929794f7de54839b5d020cab7f /source/gameengine/Converter
parente101b043e15630f3427ed648e76f773d604852f2 (diff)
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.
Diffstat (limited to 'source/gameengine/Converter')
-rw-r--r--source/gameengine/Converter/KX_BlenderSceneConverter.cpp2
1 files changed, 1 insertions, 1 deletions
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--;
}