diff options
| -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 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_operator.c | 14 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_rna.c | 6 |
6 files changed, 15 insertions, 17 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"); } diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index c014ab1dc5f..75b4cea0bb9 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -114,7 +114,7 @@ void view3d_keymap(wmWindowManager *wm) WM_keymap_add_item(keymap, "VIEW3D_OT_circle_select", CKEY, KM_PRESS, 0, 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"); } diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c index 966253f82a8..4ed48dd81dd 100644 --- a/source/blender/python/intern/bpy_operator.c +++ b/source/blender/python/intern/bpy_operator.c @@ -77,10 +77,11 @@ static PyObject *pyop_base_getattro( BPy_OperatorBase * self, PyObject *pyname ) ot = WM_operatortype_find(name); if (ot) { - return pyop_func_CreatePyObject(self->C, name); + ret= pyop_func_CreatePyObject(self->C, name); } else { PyErr_Format( PyExc_AttributeError, "Operator \"%s\" not found", name); + ret= NULL; } } @@ -101,18 +102,17 @@ static PyObject * pyop_func_call(BPy_OperatorFunc * self, PyObject *args, PyObje PropertyRNA *prop, *iterprop; CollectionPropertyIterator iter; - - if (ot == NULL) { - PyErr_SetString( PyExc_SystemError, "Operator could not be found"); - return NULL; - } - if (PyTuple_Size(args)) { PyErr_SetString( PyExc_AttributeError, "All operator args must be keywords"); return NULL; } ot= WM_operatortype_find(self->name); + if (ot == NULL) { + PyErr_SetString( PyExc_SystemError, "Operator could not be found"); + return NULL; + } + RNA_pointer_create(NULL, NULL, ot->srna, &properties, &ptr); diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 0b33f11d74d..f38d8a46573 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -70,10 +70,8 @@ static char *pyrna_enum_as_string(PointerRNA *ptr, PropertyRNA *prop) RNA_property_enum_items(ptr, prop, &item, &totitem); for (i=0; i<totitem; i++) { - if (i<totitem-1) - BLI_dynstr_appendf(dynstr, "'%s', ", item[i].identifier); - else - BLI_dynstr_appendf(dynstr, "'%s'", item[i].identifier); + + BLI_dynstr_appendf(dynstr, i?", '%s'":"'%s'", item[i].identifier); } cstring = BLI_dynstr_get_cstring(dynstr); |