[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29337] trunk/blender/source/blender/ editors/space_script/script_edit.c: better not have an instant crash key, script reload currently disabled ubless running in debug mode.
Campbell Barton
ideasman42 at gmail.com
Tue Jun 8 12:56:59 CEST 2010
Revision: 29337
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29337
Author: campbellbarton
Date: 2010-06-08 12:56:59 +0200 (Tue, 08 Jun 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_script/script_edit.c
Modified: trunk/blender/source/blender/editors/space_script/script_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_script/script_edit.c 2010-06-08 10:42:35 UTC (rev 29336)
+++ trunk/blender/source/blender/editors/space_script/script_edit.c 2010-06-08 10:56:59 UTC (rev 29337)
@@ -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 @@
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;
More information about the Bf-blender-cvs
mailing list