[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26083] trunk/blender/source/blender/ windowmanager/intern/wm_init_exit.c: load the user prefs before python so the python userdir is read.

Campbell Barton ideasman42 at gmail.com
Mon Jan 18 19:52:15 CET 2010


Revision: 26083
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26083
Author:   campbellbarton
Date:     2010-01-18 19:52:03 +0100 (Mon, 18 Jan 2010)

Log Message:
-----------
load the user prefs before python so the python userdir is read.

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

Modified: trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c	2010-01-18 17:14:54 UTC (rev 26082)
+++ trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c	2010-01-18 18:52:03 UTC (rev 26083)
@@ -129,18 +129,23 @@
 	
 	init_builtin_keyingsets(); /* editors/animation/keyframing.c */
 	
-	/* python needs initializing before loading the .B.blend
-	 * because it may contain PyDrivers. It also needs to be after
-	 * initializing space types and other internal data */
+	/* get the default database, plus a wm */
+	WM_read_homefile(C, NULL);
+
+	/* note: there is a bug where python needs initializing before loading the
+	 * .B25.blend because it may contain PyDrivers. It also needs to be after
+	 * initializing space types and other internal data.
+	 *
+	 * However cant redo this at the moment. Solution is to load python
+	 * before WM_read_homefile() or make py-drivers check if python is running.
+	 * Will try fix when the crash can be repeated. - campbell. */
+
 #ifndef DISABLE_PYTHON
 	BPY_set_context(C); /* necessary evil */
 	BPY_start_python(argc, argv);
 	BPY_load_user_modules(C);
 #endif
 
-	/* get the default database, plus a wm */
-	WM_read_homefile(C, NULL);
-
 	wm_init_reports(C); /* reports cant be initialized before the wm */
 
 	if (!G.background) {





More information about the Bf-blender-cvs mailing list