diff options
| author | Bastien Montagne <bastien@blender.org> | 2021-11-25 12:12:57 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2021-11-25 12:12:57 +0300 |
| commit | 610e68590b7f0bc0a4345bfc21bc253ff760e70c (patch) | |
| tree | 13763591eeec3c8351eccb767bcf9c3f22eafc20 | |
| parent | f12a6ff5cb4d7de349a146003509a61f58824627 (diff) | |
| parent | ce5561b815366f714e68bd81fc130afb79c267ef (diff) | |
Merge branch 'blender-v3.0-release'
| -rw-r--r-- | source/blender/python/intern/bpy_props.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index 13c7d2947cf..6a023999283 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -2630,10 +2630,14 @@ static int bpy_prop_arg_parse_tag_defines(PyObject *o, void *p) " This function must take 2 values (self, value) and return None.\n" \ " :type set: function\n" -#define BPY_PROPDEF_TYPE_DOC \ +#define BPY_PROPDEF_POINTER_TYPE_DOC \ " :arg type: A subclass of :class:`bpy.types.PropertyGroup` or :class:`bpy.types.ID`.\n" \ " :type type: class\n" +#define BPY_PROPDEF_COLLECTION_TYPE_DOC \ + " :arg type: A subclass of :class:`bpy.types.PropertyGroup`.\n" \ + " :type type: class\n" + #define BPY_PROPDEF_TAGS_DOC \ " :arg tags: Enumerator of tags that are defined by parent class.\n" \ " :type tags: set\n" @@ -3981,7 +3985,7 @@ PyDoc_STRVAR(BPy_PointerProperty_doc, "update=None)\n" "\n" " Returns a new pointer property definition.\n" - "\n" BPY_PROPDEF_TYPE_DOC BPY_PROPDEF_NAME_DOC BPY_PROPDEF_DESC_DOC + "\n" BPY_PROPDEF_POINTER_TYPE_DOC BPY_PROPDEF_NAME_DOC BPY_PROPDEF_DESC_DOC BPY_PROPDEF_OPTIONS_DOC BPY_PROPDEF_OPTIONS_OVERRIDE_DOC BPY_PROPDEF_TAGS_DOC BPY_PROPDEF_POLL_DOC BPY_PROPDEF_UPDATE_DOC); PyObject *BPy_PointerProperty(PyObject *self, PyObject *args, PyObject *kw) @@ -4104,7 +4108,7 @@ PyDoc_STRVAR(BPy_CollectionProperty_doc, "tags=set())\n" "\n" " Returns a new collection property definition.\n" - "\n" BPY_PROPDEF_TYPE_DOC BPY_PROPDEF_NAME_DOC BPY_PROPDEF_DESC_DOC + "\n" BPY_PROPDEF_COLLECTION_TYPE_DOC BPY_PROPDEF_NAME_DOC BPY_PROPDEF_DESC_DOC BPY_PROPDEF_OPTIONS_DOC BPY_PROPDEF_OPTIONS_OVERRIDE_COLLECTION_DOC BPY_PROPDEF_TAGS_DOC); PyObject *BPy_CollectionProperty(PyObject *self, PyObject *args, PyObject *kw) |