diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-06-08 14:56:59 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-06-08 14:56:59 +0400 |
commit | c5cee166309d3e334a3565b081173a151e554bb6 (patch) | |
tree | e71fe2458def3dde58b15e7203c3d222e36e6ccb | |
parent | 7caae1104eb2ed39d361f43b720ad99e6042db8a (diff) |
better not have an instant crash key, script reload currently disabled ubless running in debug mode.
removing keying sets and netrender makes reloading work so probably a problem with how rna works with these classes.
-rw-r--r-- | source/blender/editors/space_script/script_edit.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c index 064e2295006..90867712322 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -38,6 +38,7 @@ #include "BKE_global.h" #include "BKE_screen.h" #include "BKE_utildefines.h" +#include "BKE_report.h" #include "WM_api.h" #include "WM_types.h" @@ -87,7 +88,15 @@ void SCRIPT_OT_python_file_run(wmOperatorType *ot) static int script_reload_exec(bContext *C, wmOperator *op) { #ifndef DISABLE_PYTHON - BPY_eval_string(C, "__import__('bpy').utils.load_scripts(reload_scripts=True)"); + /* TODO, this crashes on netrender and keying sets, need to look into why + * disable for now unless running in debug mode */ + if(G.f & G_DEBUG) { + BPY_eval_string(C, "__import__('bpy').utils.load_scripts(reload_scripts=True)"); + } + else { + BKE_reportf(op->reports, RPT_ERROR, "reloading is currently unstable, only operates in debug mode.\n"); + return OPERATOR_CANCELLED; + } return OPERATOR_FINISHED; #endif return OPERATOR_CANCELLED; |