[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36124] trunk/blender/source/blender/ python/intern/bpy_interface.c: fix for crash when pressing ' Copy Startup Settings', was using out of date main database.

[Campbell Barton]

Revision: 36124
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36124
Author:   campbellbarton
Date:     2011-04-12 17:18:02 +0000 (Tue, 12 Apr 2011)
Log Message:
-----------
fix for crash when pressing 'Copy Startup Settings', was using out of date main database.

Modified Paths:
--------------
    trunk/blender/source/blender/python/intern/bpy_interface.c

Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c	2011-04-12 16:56:15 UTC (rev 36123)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c	2011-04-12 17:18:02 UTC (rev 36124)
@@ -552,6 +552,7 @@
 	PyObject *main_mod= NULL;
 	PyObject *py_dict, *retval;
 	int error_ret= 0;
+	Main *bmain_back;
 
 	if (!expr) return -1;
 
@@ -565,8 +566,13 @@
 
 	py_dict= PyC_DefaultNameSpace("<blender string>");
 
+	bmain_back= bpy_import_main_get();
+	bpy_import_main_set(CTX_data_main(C));
+
 	retval= PyRun_String(expr, Py_eval_input, py_dict, py_dict);
 
+	bpy_import_main_set(bmain_back);
+
 	if (retval == NULL) {
 		error_ret= -1;