diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-06-06 05:15:44 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-06-06 05:15:44 +0400 |
| commit | ed338da8c963cfcc26315584bb694a95f2c89088 (patch) | |
| tree | e21a68328e7d0d1f4d41f95fd27690172bfc0957 /source/blender/editors/space_script | |
| parent | 0cc077ec455e701a1d3caa1350051f7d3737763b (diff) | |
- WITH_CXX_GUARDEDALLOC working again
- CMake building without python or fluidsim working again (broke in recent commit)
- remove BLI_short_filename(), it wasnt used anywhere.
Diffstat (limited to 'source/blender/editors/space_script')
| -rw-r--r-- | source/blender/editors/space_script/script_edit.c | 7 | ||||
| -rw-r--r-- | source/blender/editors/space_script/space_script.c | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c index 02993549c94..064e2295006 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -50,18 +50,17 @@ #include "script_intern.h" // own include - +#ifndef DISABLE_PYTHON #include "BPY_extern.h" /* BPY_run_python_script */ +#endif static int run_pyfile_exec(bContext *C, wmOperator *op) { - ARegion *ar= CTX_wm_region(C); - - char path[512]; RNA_string_get(op->ptr, "path", path); #ifndef DISABLE_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; } diff --git a/source/blender/editors/space_script/space_script.c b/source/blender/editors/space_script/space_script.c index 9fb1d1a3f0b..0aba1df47e9 100644 --- a/source/blender/editors/space_script/space_script.c +++ b/source/blender/editors/space_script/space_script.c @@ -50,8 +50,9 @@ #include "UI_resources.h" #include "UI_view2d.h" - +#ifndef DISABLE_PYTHON #include "BPY_extern.h" +#endif #include "script_intern.h" // own include |