[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39743] trunk/blender/source/gameengine/ Converter/KX_BlenderSceneConverter.cpp: check for unlikely error when freeing a library blend file from the BGE.

Campbell Barton ideasman42 at gmail.com
Sun Aug 28 07:01:16 CEST 2011


Revision: 39743
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39743
Author:   campbellbarton
Date:     2011-08-28 05:01:16 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
check for unlikely error when freeing a library blend file from the BGE.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp

Modified: trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp	2011-08-28 02:54:26 UTC (rev 39742)
+++ trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp	2011-08-28 05:01:16 UTC (rev 39743)
@@ -1083,7 +1083,7 @@
  * most are temp and NewRemoveObject frees m_map_gameobject_to_blender */
 bool KX_BlenderSceneConverter::FreeBlendFile(struct Main *maggie)
 {
-	int maggie_index;
+	int maggie_index= -1;
 	int i=0;
 
 	if(maggie==NULL)
@@ -1101,6 +1101,10 @@
 		i++;
 	}
 
+	/* should never happen but just to be safe */
+	if(maggie_index == -1)
+		return false;
+
 	m_DynamicMaggie.erase(m_DynamicMaggie.begin() + maggie_index);
 	tag_main(maggie, 1);
 




More information about the Bf-blender-cvs mailing list