rename and negate DISABLE_PYTHON --> WITH_PYTHON
[blender.git] / source / blender / editors / space_script / script_edit.c
index 90867712322077ebd56a42e5a295d37823037f51..b9ece0add2fd2dfc578f077907306dda022588eb 100644 (file)
 #include <stdio.h>
 
 
-#include "MEM_guardedalloc.h"
 
 #include "BLI_blenlib.h"
 
 #include "BKE_context.h"
-#include "BKE_global.h"
-#include "BKE_screen.h"
-#include "BKE_utildefines.h"
-#include "BKE_report.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
 
 #include "script_intern.h"     // own include
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "BPY_extern.h" /* BPY_run_python_script */
 #endif
 
 static int run_pyfile_exec(bContext *C, wmOperator *op)
 {
        char path[512];
-       RNA_string_get(op->ptr, "path", path);
-#ifndef DISABLE_PYTHON
+       RNA_string_get(op->ptr, "filepath", path);
+#ifdef WITH_PYTHON
        if(BPY_run_python_script(C, path, NULL, op->reports)) {
                ARegion *ar= CTX_wm_region(C);
                ED_region_tag_redraw(ar);
                return OPERATOR_FINISHED;
        }
+#else
+       (void)C; /* unused */
 #endif
        return OPERATOR_CANCELLED; /* FAIL */
 }
@@ -81,23 +78,21 @@ void SCRIPT_OT_python_file_run(wmOperatorType *ot)
        ot->exec= run_pyfile_exec;
        ot->poll= ED_operator_areaactive;
 
-       RNA_def_string_file_path(ot->srna, "path", "", 512, "Path", "");
+       RNA_def_string_file_path(ot->srna, "filepath", "", 512, "Path", "");
 }
 
 
-static int script_reload_exec(bContext *C, wmOperator *op)
+static int script_reload_exec(bContext *C, wmOperator *UNUSED(op))
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /* 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;
-       }
+       WM_cursor_wait(1);
+       BPY_eval_string(C, "__import__('bpy').utils.load_scripts(reload_scripts=True)");
+       WM_cursor_wait(0);
        return OPERATOR_FINISHED;
+#else
+       (void)C; /* unused */
 #endif
        return OPERATOR_CANCELLED;
 }