diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-11-13 14:10:29 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-11-13 14:10:29 +0300 |
commit | 5a322bd67cf1f99b4d8fc26e50edb22904f58b9e (patch) | |
tree | 4739ef0abd2ce0dd110f93742e3faf9e7543fba7 /source/blender/editors/space_script | |
parent | b17964af11a1acab393ac2d51b2b0bd55a8c127c (diff) |
F8 reload works again, script errors are printed but dont stop loading every other script
Diffstat (limited to 'source/blender/editors/space_script')
-rw-r--r-- | source/blender/editors/space_script/script_edit.c | 31 | ||||
-rw-r--r-- | source/blender/editors/space_script/script_intern.h | 1 | ||||
-rw-r--r-- | source/blender/editors/space_script/script_ops.c | 2 |
3 files changed, 0 insertions, 34 deletions
diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c index 630ea752f22..355095ea290 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -89,34 +89,3 @@ void SCRIPT_OT_python_file_run(wmOperatorType *ot) RNA_def_string_file_path(ot->srna, "path", "", 512, "Path", ""); } -static int run_ui_scripts_exec(bContext *C, wmOperator *op) -{ -#ifndef DISABLE_PYTHON -// TODO -#endif - return OPERATOR_FINISHED; -} - -static int run_ui_scripts_invoke(bContext *C, wmOperator *op, wmEvent *event) -{ - int ret= run_ui_scripts_exec(C, op); - - if(ret==OPERATOR_FINISHED) - WM_event_add_notifier(C, NC_WINDOW, NULL); - - return ret; -} - - -void SCRIPT_OT_python_run_ui_scripts(wmOperatorType *ot) -{ - /* identifiers */ - ot->name= "Reload Python Interface"; - ot->description= "Reload Python interface."; - ot->idname= "SCRIPT_OT_python_run_ui_scripts"; - - /* api callbacks */ - ot->exec= run_ui_scripts_exec; - ot->invoke= run_ui_scripts_invoke; - ot->poll= ED_operator_areaactive; -} diff --git a/source/blender/editors/space_script/script_intern.h b/source/blender/editors/space_script/script_intern.h index 7534fc98de1..08ec8ea289a 100644 --- a/source/blender/editors/space_script/script_intern.h +++ b/source/blender/editors/space_script/script_intern.h @@ -40,7 +40,6 @@ void script_keymap(struct wmKeyConfig *keyconf); /* script_edit.c */ void SCRIPT_OT_python_file_run(struct wmOperatorType *ot); -void SCRIPT_OT_python_run_ui_scripts(struct wmOperatorType *ot); #endif /* ED_SCRIPT_INTERN_H */ diff --git a/source/blender/editors/space_script/script_ops.c b/source/blender/editors/space_script/script_ops.c index fd87705648f..4ac90e852fb 100644 --- a/source/blender/editors/space_script/script_ops.c +++ b/source/blender/editors/space_script/script_ops.c @@ -60,7 +60,6 @@ void script_operatortypes(void) { WM_operatortype_append(SCRIPT_OT_python_file_run); - WM_operatortype_append(SCRIPT_OT_python_run_ui_scripts); } void script_keymap(wmKeyConfig *keyconf) @@ -69,6 +68,5 @@ void script_keymap(wmKeyConfig *keyconf) /* TODO - this is just while we have no way to load a text datablock */ RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_python_file_run", PKEY, KM_PRESS, KM_CTRL|KM_SHIFT|KM_ALT, 0)->ptr, "path", "test.py"); - WM_keymap_add_item(keymap, "SCRIPT_OT_python_run_ui_scripts", PKEY, KM_PRESS, KM_SHIFT, 0); } |