diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-06-17 18:44:04 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-17 18:44:08 +0300 |
commit | 83c28ff96a5745c7f5713665890211657b45a35f (patch) | |
tree | 9e6d2fba2b6b0d0d9e55b283b664b1d304f39708 /source/blender/python | |
parent | 54f0f87a4b715deeece0ceb6f78ab325ba598e35 (diff) | |
parent | 8bf108dd4899c5168f08ae459e9750f493a3cf32 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python')
-rw-r--r-- | source/blender/python/intern/bpy_props.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index 2656e612b18..20faa5aa576 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -2862,7 +2862,7 @@ PyDoc_STRVAR(BPy_PointerProperty_doc, "name=\"\", " "description=\"\", " "options={'ANIMATABLE'}, " - "update=None,\n" + "update=None, " "poll=None)\n" "\n" " Returns a new pointer property definition.\n" |