diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-02-26 23:21:09 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-02-26 23:21:09 +0300 |
| commit | 63b31ef91b562a1a4aa95991323555a140dd6ede (patch) | |
| tree | 4287fcc7edc5e01efbd4b26d7c923c9b0cd8d830 /source/blender/freestyle/intern/system/PythonInterpreter.h | |
| parent | 745e396d63ed15fa69203e04840597112498ec3b (diff) | |
| parent | 2f0d93ba563ae2c87a088f21113d5559ab9abfc4 (diff) | |
Merged changes in the trunk up to revision 35203.
Conflicts resolved:
source/creator/creator.c
source/blender/python/intern/bpy.c
Diffstat (limited to 'source/blender/freestyle/intern/system/PythonInterpreter.h')
| -rwxr-xr-x | source/blender/freestyle/intern/system/PythonInterpreter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h index 379e9a0fdef..24b03bd2dd3 100755 --- a/source/blender/freestyle/intern/system/PythonInterpreter.h +++ b/source/blender/freestyle/intern/system/PythonInterpreter.h @@ -79,7 +79,7 @@ class LIB_SYSTEM_EXPORT PythonInterpreter : public Interpreter int status; Text *text = add_text(fn, G.main->name); if (text) { - status = BPY_text_exec(_context, text, reports); + status = BPY_text_exec(_context, text, reports, false); unlink_text(G.main, text); free_libblock(&G.main->text, text); } else { @@ -110,7 +110,7 @@ class LIB_SYSTEM_EXPORT PythonInterpreter : public Interpreter BKE_reports_clear(reports); - if (!BPY_text_exec(_context, text, reports)) { + if (!BPY_text_exec(_context, text, reports, false)) { cout << "\nError executing Python script from PythonInterpreter::interpretText" << endl; cout << "Name: " << name << endl; cout << "Errors: " << endl; @@ -163,7 +163,7 @@ private: } } - BPY_text_exec(_context, text, NULL); + BPY_text_exec(_context, text, NULL, false); // cleaning up unlink_text(G.main, text); |