diff options
Diffstat (limited to 'source/blender/python')
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_api.c | 2 | ||||
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_types.c | 12 | ||||
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_utils.c | 2 | ||||
-rw-r--r-- | source/blender/python/generic/imbuf_py_api.c | 4 | ||||
-rw-r--r-- | source/blender/python/gpu/gpu_py_offscreen.c | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy.c | 10 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_library_load.c | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_msgbus.c | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna_anim.c | 4 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna_id_collection.c | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_utils_units.c | 4 | ||||
-rw-r--r-- | source/blender/python/mathutils/mathutils_kdtree.c | 2 |
12 files changed, 24 insertions, 24 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_api.c b/source/blender/python/bmesh/bmesh_py_api.c index 6dcf8bc5f1c..906f8ab702f 100644 --- a/source/blender/python/bmesh/bmesh_py_api.c +++ b/source/blender/python/bmesh/bmesh_py_api.c @@ -125,7 +125,7 @@ static PyObject *bpy_bm_update_edit_mesh(PyObject *UNUSED(self), PyObject *args, if (!PyArg_ParseTupleAndKeywords(args, kw, - "O|O&O&:update_edit_mesh", + "O|$O&O&:update_edit_mesh", (char **)kwlist, &py_me, PyC_ParseBool, diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index 598640f8f68..fc6536be88d 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -1103,7 +1103,7 @@ static PyObject *bpy_bmesh_from_object(BPy_BMesh *self, PyObject *args, PyObject if (!PyArg_ParseTupleAndKeywords(args, kw, - "OO|O&O&:from_object", + "OO|$O&O&:from_object", (char **)kwlist, &py_object, &py_depsgraph, @@ -1204,7 +1204,7 @@ static PyObject *bpy_bmesh_from_mesh(BPy_BMesh *self, PyObject *args, PyObject * if (!PyArg_ParseTupleAndKeywords(args, kw, - "O|O&O&i:from_mesh", + "O|$O&O&i:from_mesh", (char **)kwlist, &py_mesh, PyC_ParseBool, @@ -1304,7 +1304,7 @@ static PyObject *bpy_bmesh_transform(BPy_BMElem *self, PyObject *args, PyObject if (!PyArg_ParseTupleAndKeywords(args, kw, - "O!|O!:transform", + "O!|$O!:transform", (char **)kwlist, &matrix_Type, &mat, @@ -1366,7 +1366,7 @@ static PyObject *bpy_bmesh_calc_volume(BPy_BMElem *self, PyObject *args, PyObjec BPY_BM_CHECK_OBJ(self); if (!PyArg_ParseTupleAndKeywords( - args, kw, "|O!:calc_volume", (char **)kwlist, &PyBool_Type, &is_signed)) { + args, kw, "|$O!:calc_volume", (char **)kwlist, &PyBool_Type, &is_signed)) { return NULL; } @@ -1858,7 +1858,7 @@ static PyObject *bpy_bmface_copy(BPy_BMFace *self, PyObject *args, PyObject *kw) if (!PyArg_ParseTupleAndKeywords(args, kw, - "|O&O&:BMFace.copy", + "|$O&O&:BMFace.copy", (char **)kwlist, PyC_ParseBool, &do_verts, @@ -2654,7 +2654,7 @@ static PyObject *bpy_bmelemseq_sort(BPy_BMElemSeq *self, PyObject *args, PyObjec if (args != NULL) { if (!PyArg_ParseTupleAndKeywords(args, kw, - "|OO&:BMElemSeq.sort", + "|$OO&:BMElemSeq.sort", (char **)kwlist, &keyfunc, PyC_ParseBool, diff --git a/source/blender/python/bmesh/bmesh_py_utils.c b/source/blender/python/bmesh/bmesh_py_utils.c index 61a84d77eb7..c1e28182c53 100644 --- a/source/blender/python/bmesh/bmesh_py_utils.c +++ b/source/blender/python/bmesh/bmesh_py_utils.c @@ -450,7 +450,7 @@ static PyObject *bpy_bm_utils_face_split(PyObject *UNUSED(self), PyObject *args, if (!PyArg_ParseTupleAndKeywords(args, kw, - "O!O!O!|OO&O!:face_split", + "O!O!O!|$OO&O!:face_split", (char **)kwlist, &BPy_BMFace_Type, &py_face, diff --git a/source/blender/python/generic/imbuf_py_api.c b/source/blender/python/generic/imbuf_py_api.c index 2a71991f88c..53e22314ec4 100644 --- a/source/blender/python/generic/imbuf_py_api.c +++ b/source/blender/python/generic/imbuf_py_api.c @@ -106,7 +106,7 @@ static PyObject *py_imbuf_resize(Py_ImBuf *self, PyObject *args, PyObject *kw) struct PyC_StringEnum method = {method_items, FAST}; static const char *_keywords[] = {"size", "method", NULL}; - static _PyArg_Parser _parser = {"(ii)|O&:resize", _keywords, 0}; + static _PyArg_Parser _parser = {"(ii)|$O&:resize", _keywords, 0}; if (!_PyArg_ParseTupleAndKeywordsFast( args, kw, &_parser, &size[0], &size[1], PyC_ParseStringEnum, &method)) { return NULL; @@ -510,7 +510,7 @@ static PyObject *M_imbuf_write(PyObject *UNUSED(self), PyObject *args, PyObject const char *filepath = NULL; static const char *_keywords[] = {"image", "filepath", NULL}; - static _PyArg_Parser _parser = {"O!|s:write", _keywords, 0}; + static _PyArg_Parser _parser = {"O!|$s:write", _keywords, 0}; if (!_PyArg_ParseTupleAndKeywordsFast(args, kw, &_parser, &Py_ImBuf_Type, &py_imb, &filepath)) { return NULL; } diff --git a/source/blender/python/gpu/gpu_py_offscreen.c b/source/blender/python/gpu/gpu_py_offscreen.c index 28bd24a6877..0d29bc98a31 100644 --- a/source/blender/python/gpu/gpu_py_offscreen.c +++ b/source/blender/python/gpu/gpu_py_offscreen.c @@ -194,7 +194,7 @@ static PyObject *pygpu_offscreen_unbind(BPyGPUOffScreen *self, PyObject *args, P BPY_GPU_OFFSCREEN_CHECK_OBJ(self); static const char *_keywords[] = {"restore", NULL}; - static _PyArg_Parser _parser = {"|O&:unbind", _keywords, 0}; + static _PyArg_Parser _parser = {"|$O&:unbind", _keywords, 0}; if (!_PyArg_ParseTupleAndKeywordsFast(args, kwds, &_parser, PyC_ParseBool, &restore)) { return NULL; } diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index 547cf2ad38f..dc9b8b52821 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -118,7 +118,7 @@ static PyObject *bpy_blend_paths(PyObject *UNUSED(self), PyObject *args, PyObjec bool local = false; static const char *_keywords[] = {"absolute", "packed", "local", NULL}; - static _PyArg_Parser _parser = {"|O&O&O&:blend_paths", _keywords, 0}; + static _PyArg_Parser _parser = {"|$O&O&O&:blend_paths", _keywords, 0}; if (!_PyArg_ParseTupleAndKeywordsFast(args, kw, &_parser, @@ -164,8 +164,8 @@ static PyObject *bpy_user_resource(PyObject *UNUSED(self), PyObject *args, PyObj const char *path; - static const char *_keywords[] = {"type", "subdir", NULL}; - static _PyArg_Parser _parser = {"O&|s:user_resource", _keywords, 0}; + static const char *_keywords[] = {"type", "path", NULL}; + static _PyArg_Parser _parser = {"O&|$s:user_resource", _keywords, 0}; if (!_PyArg_ParseTupleAndKeywordsFast(args, kw, &_parser, PyC_ParseStringEnum, &type, &subdir)) { return NULL; } @@ -201,7 +201,7 @@ static PyObject *bpy_system_resource(PyObject *UNUSED(self), PyObject *args, PyO const char *path; static const char *_keywords[] = {"type", "path", NULL}; - static _PyArg_Parser _parser = {"O&|s:system_resource", _keywords, 0}; + static _PyArg_Parser _parser = {"O&|$s:system_resource", _keywords, 0}; if (!_PyArg_ParseTupleAndKeywordsFast(args, kw, &_parser, PyC_ParseStringEnum, &type, &subdir)) { return NULL; } @@ -239,7 +239,7 @@ static PyObject *bpy_resource_path(PyObject *UNUSED(self), PyObject *args, PyObj const char *path; static const char *_keywords[] = {"type", "major", "minor", NULL}; - static _PyArg_Parser _parser = {"O&|ii:resource_path", _keywords, 0}; + static _PyArg_Parser _parser = {"O&|$ii:resource_path", _keywords, 0}; if (!_PyArg_ParseTupleAndKeywordsFast( args, kw, &_parser, PyC_ParseStringEnum, &type, &major, &minor)) { return NULL; diff --git a/source/blender/python/intern/bpy_library_load.c b/source/blender/python/intern/bpy_library_load.c index 96ff6a111d9..7a688b8c77d 100644 --- a/source/blender/python/intern/bpy_library_load.c +++ b/source/blender/python/intern/bpy_library_load.c @@ -195,7 +195,7 @@ static PyObject *bpy_lib_load(BPy_PropertyRNA *self, PyObject *args, PyObject *k bool is_rel = false, is_link = false, use_assets_only = false; static const char *_keywords[] = {"filepath", "link", "relative", "assets_only", NULL}; - static _PyArg_Parser _parser = {"s|O&O&O&:load", _keywords, 0}; + static _PyArg_Parser _parser = {"s|$O&O&O&:load", _keywords, 0}; if (!_PyArg_ParseTupleAndKeywordsFast(args, kw, &_parser, diff --git a/source/blender/python/intern/bpy_msgbus.c b/source/blender/python/intern/bpy_msgbus.c index 7cc7f864c9c..4e6d2aacb49 100644 --- a/source/blender/python/intern/bpy_msgbus.c +++ b/source/blender/python/intern/bpy_msgbus.c @@ -245,7 +245,7 @@ static PyObject *bpy_msgbus_subscribe_rna(PyObject *UNUSED(self), PyObject *args "options", NULL, }; - static _PyArg_Parser _parser = {"OOO!O|O!:subscribe_rna", _keywords, 0}; + static _PyArg_Parser _parser = {"OOO!O|$O!:subscribe_rna", _keywords, 0}; if (!_PyArg_ParseTupleAndKeywordsFast(args, kw, &_parser, diff --git a/source/blender/python/intern/bpy_rna_anim.c b/source/blender/python/intern/bpy_rna_anim.c index b7648ee830f..b359e93315e 100644 --- a/source/blender/python/intern/bpy_rna_anim.c +++ b/source/blender/python/intern/bpy_rna_anim.c @@ -324,7 +324,7 @@ PyObject *pyrna_struct_keyframe_insert(BPy_StructRNA *self, PyObject *args, PyOb if (pyrna_struct_keyframe_parse(&self->ptr, args, kw, - "s|ifsO!:bpy_struct.keyframe_insert()", + "s|$ifsO!:bpy_struct.keyframe_insert()", "bpy_struct.keyframe_insert()", &path_full, &index, @@ -443,7 +443,7 @@ PyObject *pyrna_struct_keyframe_delete(BPy_StructRNA *self, PyObject *args, PyOb if (pyrna_struct_keyframe_parse(&self->ptr, args, kw, - "s|ifsO!:bpy_struct.keyframe_delete()", + "s|$ifsO!:bpy_struct.keyframe_delete()", "bpy_struct.keyframe_insert()", &path_full, &index, diff --git a/source/blender/python/intern/bpy_rna_id_collection.c b/source/blender/python/intern/bpy_rna_id_collection.c index d4127b26629..ac061c3dd60 100644 --- a/source/blender/python/intern/bpy_rna_id_collection.c +++ b/source/blender/python/intern/bpy_rna_id_collection.c @@ -171,7 +171,7 @@ static PyObject *bpy_user_map(PyObject *UNUSED(self), PyObject *args, PyObject * IDUserMapData data_cb = {NULL}; static const char *_keywords[] = {"subset", "key_types", "value_types", NULL}; - static _PyArg_Parser _parser = {"|O$O!O!:user_map", _keywords, 0}; + static _PyArg_Parser _parser = {"|$OO!O!:user_map", _keywords, 0}; if (!_PyArg_ParseTupleAndKeywordsFast( args, kwds, &_parser, &subset, &PySet_Type, &key_types, &PySet_Type, &val_types)) { return NULL; diff --git a/source/blender/python/intern/bpy_utils_units.c b/source/blender/python/intern/bpy_utils_units.c index b460ef5e0c0..e5ac1ba9a95 100644 --- a/source/blender/python/intern/bpy_utils_units.c +++ b/source/blender/python/intern/bpy_utils_units.c @@ -183,7 +183,7 @@ static PyObject *bpyunits_to_value(PyObject *UNUSED(self), PyObject *args, PyObj "str_ref_unit", NULL, }; - static _PyArg_Parser _parser = {"sss#|z:to_value", _keywords, 0}; + static _PyArg_Parser _parser = {"sss#|$z:to_value", _keywords, 0}; if (!_PyArg_ParseTupleAndKeywordsFast( args, kw, &_parser, &usys_str, &ucat_str, &inpt, &str_len, &uref)) { return NULL; @@ -260,7 +260,7 @@ static PyObject *bpyunits_to_string(PyObject *UNUSED(self), PyObject *args, PyOb "compatible_unit", NULL, }; - static _PyArg_Parser _parser = {"ssd|iO&O&:to_string", _keywords, 0}; + static _PyArg_Parser _parser = {"ssd|$iO&O&:to_string", _keywords, 0}; if (!_PyArg_ParseTupleAndKeywordsFast(args, kw, &_parser, diff --git a/source/blender/python/mathutils/mathutils_kdtree.c b/source/blender/python/mathutils/mathutils_kdtree.c index d54dbc9ab05..1ff574fefa8 100644 --- a/source/blender/python/mathutils/mathutils_kdtree.c +++ b/source/blender/python/mathutils/mathutils_kdtree.c @@ -222,7 +222,7 @@ static PyObject *py_kdtree_find(PyKDTree *self, PyObject *args, PyObject *kwargs const char *keywords[] = {"co", "filter", NULL}; if (!PyArg_ParseTupleAndKeywords( - args, kwargs, "O|O:find", (char **)keywords, &py_co, &py_filter)) { + args, kwargs, "O|$O:find", (char **)keywords, &py_co, &py_filter)) { return NULL; } |