diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-12 21:18:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-12 21:18:02 +0400 |
| commit | 771390793fa41add5e1071b3736fa829da5438a5 (patch) | |
| tree | 05dbdd77af2a4baa75c8f219e6ff98d9ff075bf1 /source/blender/python/intern/bpy_interface.c | |
| parent | 2ed8b5f6798f64557288ea44ac91b34851073523 (diff) | |
fix for crash when pressing 'Copy Startup Settings', was using out of date main database.
Diffstat (limited to 'source/blender/python/intern/bpy_interface.c')
| -rw-r--r-- | source/blender/python/intern/bpy_interface.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 392d0c5df57..d323c2a3475 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -552,6 +552,7 @@ int BPY_string_exec(bContext *C, const char *expr) PyObject *main_mod= NULL; PyObject *py_dict, *retval; int error_ret= 0; + Main *bmain_back; if (!expr) return -1; @@ -565,8 +566,13 @@ int BPY_string_exec(bContext *C, const char *expr) 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; |