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:
authorCampbell Barton <ideasman42@gmail.com>2011-03-12 18:15:40 +0300
committerCampbell Barton <ideasman42@gmail.com>2011-03-12 18:15:40 +0300
commita5e59ede6e275d89fb74ab2e2ae1ee581e08356b (patch)
tree16f9ff2f605108147d1ef2c88975f4c93b419408 /source/gameengine
parentf6b21ecf840627f384c84e1a869ca54698792a87 (diff)
pass report list along to BLO_blendhandle_from_file(), avoid unlikely crash in the append operator.
Diffstat (limited to 'source/gameengine')
-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 49f6b94023c..0aee105b961 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -942,7 +942,7 @@ bool KX_BlenderSceneConverter::LinkBlendFileMemory(void *data, int length, const
bool KX_BlenderSceneConverter::LinkBlendFilePath(const char *path, char *group, KX_Scene *scene_merge, char **err_str)
{
- BlendHandle *bpy_openlib = BLO_blendhandle_from_file( (char *)path );
+ BlendHandle *bpy_openlib = BLO_blendhandle_from_file((char *)path, NULL);
// Error checking is done in LinkBlendFile
return LinkBlendFile(bpy_openlib, path, group, scene_merge, err_str);