[Bf-blender-cvs] [d44132d] master: Fix for crash with game engines LibLoad feature

Campbell Barton noreply at git.blender.org
Mon Dec 30 02:19:55 CET 2013


Commit: d44132d0d01d4ac6ce9355b88c823d1b2cf0f004
Author: Campbell Barton
Date:   Mon Dec 30 12:18:41 2013 +1100
https://developer.blender.org/rBd44132d0d01d4ac6ce9355b88c823d1b2cf0f004

Fix for crash with game engines LibLoad feature

===================================================================

M	source/gameengine/Converter/KX_BlenderSceneConverter.cpp

===================================================================

diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 4ed8e3e..b1a76a6 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -1113,7 +1113,7 @@ KX_LibLoadStatus *KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openl
 		return NULL;
 	}
 	
-	main_newlib= (Main *)MEM_callocN( sizeof(Main), "BgeMain");
+	main_newlib = BKE_main_new();
 	BKE_reports_init(&reports, RPT_STORE);
 
 	load_datablocks(main_newlib, bpy_openlib, path, idcode);




More information about the Bf-blender-cvs mailing list