Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/space_script/script_edit.c')
-rw-r--r--source/blender/editors/space_script/script_edit.c125
1 files changed, 62 insertions, 63 deletions
diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c
index 4b5cd6b7166..48248fe1dd2 100644
--- a/source/blender/editors/space_script/script_edit.c
+++ b/source/blender/editors/space_script/script_edit.c
@@ -21,7 +21,6 @@
* \ingroup spscript
*/
-
#include <string.h>
#include <stdio.h>
@@ -40,69 +39,68 @@
#include "ED_screen.h"
-
#include "script_intern.h" // own include
#ifdef WITH_PYTHON
-#include "BPY_extern.h" /* BPY_script_exec */
+# include "BPY_extern.h" /* BPY_script_exec */
#endif
static int run_pyfile_exec(bContext *C, wmOperator *op)
{
- char path[512];
- RNA_string_get(op->ptr, "filepath", path);
+ char path[512];
+ RNA_string_get(op->ptr, "filepath", path);
#ifdef WITH_PYTHON
- if (BPY_execute_filepath(C, path, op->reports)) {
- ARegion *ar = CTX_wm_region(C);
- ED_region_tag_redraw(ar);
- return OPERATOR_FINISHED;
- }
+ if (BPY_execute_filepath(C, path, op->reports)) {
+ ARegion *ar = CTX_wm_region(C);
+ ED_region_tag_redraw(ar);
+ return OPERATOR_FINISHED;
+ }
#else
- (void)C; /* unused */
+ (void)C; /* unused */
#endif
- return OPERATOR_CANCELLED; /* FAIL */
+ return OPERATOR_CANCELLED; /* FAIL */
}
void SCRIPT_OT_python_file_run(wmOperatorType *ot)
{
- /* identifiers */
- ot->name = "Run Python File";
- ot->description = "Run Python file";
- ot->idname = "SCRIPT_OT_python_file_run";
- ot->flag = OPTYPE_UNDO;
+ /* identifiers */
+ ot->name = "Run Python File";
+ ot->description = "Run Python file";
+ ot->idname = "SCRIPT_OT_python_file_run";
+ ot->flag = OPTYPE_UNDO;
- /* api callbacks */
- ot->exec = run_pyfile_exec;
- ot->poll = ED_operator_areaactive;
+ /* api callbacks */
+ ot->exec = run_pyfile_exec;
+ ot->poll = ED_operator_areaactive;
- ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
- RNA_def_string_file_path(ot->srna, "filepath", NULL, FILE_MAX, "Path", "");
+ RNA_def_string_file_path(ot->srna, "filepath", NULL, FILE_MAX, "Path", "");
}
#ifdef WITH_PYTHON
static bool script_test_modal_operators(bContext *C)
{
- wmWindowManager *wm;
- wmWindow *win;
-
- wm = CTX_wm_manager(C);
-
- for (win = wm->windows.first; win; win = win->next) {
- LISTBASE_FOREACH (wmEventHandler *, handler_base, &win->modalhandlers) {
- if (handler_base->type == WM_HANDLER_TYPE_OP) {
- wmEventHandler_Op *handler = (wmEventHandler_Op *)handler_base;
- if (handler->op != NULL) {
- wmOperatorType *ot = handler->op->type;
- if (ot->ext.srna) {
- return true;
- }
- }
- }
- }
- }
-
- return false;
+ wmWindowManager *wm;
+ wmWindow *win;
+
+ wm = CTX_wm_manager(C);
+
+ for (win = wm->windows.first; win; win = win->next) {
+ LISTBASE_FOREACH (wmEventHandler *, handler_base, &win->modalhandlers) {
+ if (handler_base->type == WM_HANDLER_TYPE_OP) {
+ wmEventHandler_Op *handler = (wmEventHandler_Op *)handler_base;
+ if (handler->op != NULL) {
+ wmOperatorType *ot = handler->op->type;
+ if (ot->ext.srna) {
+ return true;
+ }
+ }
+ }
+ }
+ }
+
+ return false;
}
#endif
@@ -110,32 +108,33 @@ static int script_reload_exec(bContext *C, wmOperator *op)
{
#ifdef WITH_PYTHON
- /* clear running operators */
- if (script_test_modal_operators(C)) {
- BKE_report(op->reports, RPT_ERROR, "Can't reload with running modal operators");
- return OPERATOR_CANCELLED;
- }
-
- /* TODO, this crashes on netrender and keying sets, need to look into why
- * disable for now unless running in debug mode */
- WM_cursor_wait(1);
- BPY_execute_string(C, (const char *[]){"bpy", NULL}, "bpy.utils.load_scripts(reload_scripts=True)");
- WM_cursor_wait(0);
- WM_event_add_notifier(C, NC_WINDOW, NULL);
- return OPERATOR_FINISHED;
+ /* clear running operators */
+ if (script_test_modal_operators(C)) {
+ BKE_report(op->reports, RPT_ERROR, "Can't reload with running modal operators");
+ return OPERATOR_CANCELLED;
+ }
+
+ /* TODO, this crashes on netrender and keying sets, need to look into why
+ * disable for now unless running in debug mode */
+ WM_cursor_wait(1);
+ BPY_execute_string(
+ C, (const char *[]){"bpy", NULL}, "bpy.utils.load_scripts(reload_scripts=True)");
+ WM_cursor_wait(0);
+ WM_event_add_notifier(C, NC_WINDOW, NULL);
+ return OPERATOR_FINISHED;
#else
- UNUSED_VARS(C, op);
- return OPERATOR_CANCELLED;
+ UNUSED_VARS(C, op);
+ return OPERATOR_CANCELLED;
#endif
}
void SCRIPT_OT_reload(wmOperatorType *ot)
{
- /* identifiers */
- ot->name = "Reload Scripts";
- ot->description = "Reload Scripts";
- ot->idname = "SCRIPT_OT_reload";
+ /* identifiers */
+ ot->name = "Reload Scripts";
+ ot->description = "Reload Scripts";
+ ot->idname = "SCRIPT_OT_reload";
- /* api callbacks */
- ot->exec = script_reload_exec;
+ /* api callbacks */
+ ot->exec = script_reload_exec;
}