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.

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;