archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

* temporary PKey in the script and 3D view runs "./test.py" (for testing PyOperators that need to run in the user interface context atm)

Browse Source 
* added ED_SCRIPT_OT_run_pyfile that takes a filename argument.
* RNA_property_string_set didn't add a value to ID props if the prop wasnt there (like ints, floats and bools do)
* bpy_operator.c - raise an error when unknown keyword args are passed to any operator .

Examples of bpy operator api...

bpyoperator.ED_VIEW3D_OT_viewhome(center=1)
bpyoperator.ED_SCR_OT_frame_offset(delta=10)
bpyoperator.ED_VIEW3D_OT_make_parent(type='OBJECT')

At the moment there is no way to stop the operators .invoke() function from running so ED_VIEW3D_OT_make_parent still opens the menu even though it doesn't need to.
This commit is contained in:
Campbell Barton
2008-12-25 14:17:54 +00:00
parent d7e8becefe
commit de9437e57a
9 changed files with 208 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/python/intern/bpy_operator.c
View File

@@ -93,6 +93,7 @@ static PyObject * pyop_func_call(BPy_OperatorFunc * self, PyObject *args, PyObje
wmOperatorType *ot;
int error_val = 0;
int totkw;
const char *arg_name= NULL;
PyObject *item;
@@ -118,6 +119,7 @@ static PyObject * pyop_func_call(BPy_OperatorFunc * self, PyObject *args, PyObje
iterprop= RNA_struct_iterator_property(&ptr);
RNA_property_collection_begin(&ptr, iterprop, &iter);
totkw = kw ? PyDict_Size(kw):0;
for(; iter.valid; RNA_property_collection_next(&iter)) {
prop= iter.ptr.data;
@@ -144,26 +146,39 @@ static PyObject * pyop_func_call(BPy_OperatorFunc * self, PyObject *args, PyObje
error_val= 1;
break;
}
totkw--;
}
RNA_property_collection_end(&iter);
if (error_val) {
if (properties) {
IDP_FreeProperty(properties);
MEM_freeN(properties);
if (error_val==0 && totkw > 0) { /* some keywords were given that were not used :/ */
PyObject *key, *value;
Py_ssize_t pos = 0;
while (PyDict_Next(kw, &pos, &key, &value)) {
arg_name= _PyUnicode_AsString(key);
if (RNA_struct_find_property(&ptr, arg_name) == NULL) break;
arg_name= NULL;
}
return NULL;
PyErr_Format( PyExc_AttributeError, "argument \"%s\" unrecognized", arg_name ? arg_name : "<UNKNOWN>");
error_val = 1;
}
if (error_val==0) {
WM_operator_name_call(self->C, self->name, WM_OP_DEFAULT, properties);
}
WM_operator_name_call(self->C, self->name, WM_OP_DEFAULT, properties);
if (properties) {
IDP_FreeProperty(properties);
MEM_freeN(properties);
}
if (error_val) {
return NULL;
}
Py_RETURN_NONE;
}