diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-12-26 15:39:53 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-12-26 15:39:53 +0300 |
| commit | 7715e45a7adf2cc07856956aef27fc6359af94e1 (patch) | |
| tree | 2f15a7bdd58d5270af4b845292a77a9b6a90d846 /source/blender/editors/space_script | |
| parent | d6704568f87c71940feb2b7b28950b48a7d5fcf1 (diff) | |
removed ED_ prefix from script operator.
python operator api was crashing when unknown operators were called.
Diffstat (limited to 'source/blender/editors/space_script')
| -rw-r--r-- | source/blender/editors/space_script/script_edit.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_script/script_intern.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_script/script_ops.c | 4 |
3 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 5ecf7be615c..cf3f1ca07da 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -73,12 +73,12 @@ static int run_pyfile_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ED_SCRIPT_OT_run_pyfile(wmOperatorType *ot) +void SCRIPT_OT_run_pyfile(wmOperatorType *ot) { /* identifiers */ ot->name= "Run python file"; - ot->idname= "ED_SCRIPT_OT_run_pyfile"; + ot->idname= "SCRIPT_OT_run_pyfile"; /* api callbacks */ ot->exec= run_pyfile_exec; diff --git a/source/blender/editors/space_script/script_intern.h b/source/blender/editors/space_script/script_intern.h index 59996495666..e9dd88e893c 100644 --- a/source/blender/editors/space_script/script_intern.h +++ b/source/blender/editors/space_script/script_intern.h @@ -39,7 +39,7 @@ void script_operatortypes(void); void script_keymap(struct wmWindowManager *wm); /* script_edit.c */ -void ED_SCRIPT_OT_run_pyfile(struct wmOperatorType *ot); +void SCRIPT_OT_run_pyfile(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 f6e4fa73cae..45cbf9f8a2d 100644 --- a/source/blender/editors/space_script/script_ops.c +++ b/source/blender/editors/space_script/script_ops.c @@ -59,7 +59,7 @@ void script_operatortypes(void) { - WM_operatortype_append(ED_SCRIPT_OT_run_pyfile); + WM_operatortype_append(SCRIPT_OT_run_pyfile); } void script_keymap(wmWindowManager *wm) @@ -67,6 +67,6 @@ void script_keymap(wmWindowManager *wm) ListBase *keymap= WM_keymap_listbase(wm, "Script", SPACE_SCRIPT, 0); /* TODO - this is just while we have no way to load a text datablock */ - RNA_string_set(WM_keymap_add_item(keymap, "ED_SCRIPT_OT_run_pyfile", PKEY, KM_PRESS, 0, 0)->ptr, "filename", "test.py"); + RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_run_pyfile", PKEY, KM_PRESS, 0, 0)->ptr, "filename", "test.py"); } |