[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29706] trunk/blender/source/blender/ windowmanager/intern/wm_files.c: fix for crash running the file load operator in background mode:

Campbell Barton ideasman42 at gmail.com
Sat Jun 26 15:24:52 CEST 2010


Revision: 29706
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29706
Author:   campbellbarton
Date:     2010-06-26 15:24:52 +0200 (Sat, 26 Jun 2010)

Log Message:
-----------
fix for crash running the file load operator in background mode:
 bpy.ops.wm.open_mainfile(filepath="some.blend")

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-06-26 11:44:57 UTC (rev 29705)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-06-26 13:24:52 UTC (rev 29706)
@@ -220,7 +220,9 @@
 						if(win->active)
 							wm->winactive= win;
 
-						GHOST_SetWindowUserData(win->ghostwin, win);	/* pointer back */
+						if(!G.background) /* file loading in background mode still calls this */
+							GHOST_SetWindowUserData(win->ghostwin, win);	/* pointer back */
+
 						oldwin->ghostwin= NULL;
 						
 						win->eventstate= oldwin->eventstate;





More information about the Bf-blender-cvs mailing list