diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-06-26 06:43:56 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-26 06:43:56 +0300 |
commit | 6d1ae5897f03476076509a784244cd0316cc696c (patch) | |
tree | e28c18eb38b41fc35d45d74ec74a6284f81cee4e /source/blender/python | |
parent | fb96228441d98f9af5d8d7361359a54c9b554967 (diff) | |
parent | 0172ed8fe55b402b95be51f4d876da9794b2ac55 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python')
-rw-r--r-- | source/blender/python/intern/bpy_props.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index 20faa5aa576..c7787ba9682 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -2862,8 +2862,8 @@ PyDoc_STRVAR(BPy_PointerProperty_doc, "name=\"\", " "description=\"\", " "options={'ANIMATABLE'}, " - "update=None, " - "poll=None)\n" + "poll=None, " + "update=None)\n" "\n" " Returns a new pointer property definition.\n" "\n" @@ -3001,7 +3001,7 @@ PyObject *BPy_CollectionProperty(PyObject *self, PyObject *args, PyObject *kw) } PyDoc_STRVAR(BPy_RemoveProperty_doc, -".. function:: RemoveProperty(cls, attr="")\n" +".. function:: RemoveProperty(cls, attr)\n" "\n" " Removes a dynamically defined property.\n" "\n" |