Merge branch 'master' into blender2.8

2017-06-18 01:44:04 +10:00
parent 54f0f87a4b 8bf108dd48
commit 83c28ff96a
6 changed files with 66 additions and 7 deletions
--- 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"