griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

better not have an instant crash key, script reload currently disabled ubless running in debug mode.

Browse Source 
removing keying sets and netrender makes reloading work so probably a problem with how rna works with these classes.
This commit is contained in:
Campbell Barton
2010-06-08 10:56:59 +00:00
parent 7caae1104e
commit c5cee16630
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/space_script/script_edit.c
View File

@@ -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;