[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57680] trunk/blender/source/gameengine/ GamePlayer/ghost/GPG_ghost.cpp: BGE: fix [#35811] Blenderplayer crash on closing if file saved with an actual version.

[Daniel Stokes]

Revision: 57680
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57680
Author:   kupoman
Date:     2013-06-24 04:21:17 +0000 (Mon, 24 Jun 2013)
Log Message:
-----------
BGE: fix [#35811] Blenderplayer crash on closing if file saved with an actual 
version.

Making sure free_nodesystem() is called before BLO_blendfiledata_free() fixes 
the problem. free_nodesystem() relies on blendfiledata.

Modified Paths:
--------------
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp      
2013-06-24 03:06:32 UTC (rev 57679)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp      
2013-06-24 04:21:17 UTC (rev 57680)
@@ -1031,6 +1031,9 @@
                                                 * removal is needed else the 
system will free an already freed value */
                                                
system->removeEventConsumer(&app);
 
+                                               /* nodesystem relies on 
blendfile data, free it first */
+                                               free_nodesystem();
+
                                                BLO_blendfiledata_free(bfd);
                                                if (python_main) 
MEM_freeN(python_main);
                                        }
@@ -1061,7 +1064,6 @@
 
        IMB_exit();
        BKE_images_exit();
-       free_nodesystem();
 
        SYS_DeleteSystem(syshandle);
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs