Merge branch 'master' into blender2.8

2018-07-02 12:03:56 +02:00
parent ad5a20efce b88e51dd55
commit b076b3853c
190 changed files with 611 additions and 606 deletions
--- a/source/blender/python/intern/bpy_props.c
+++ b/source/blender/python/intern/bpy_props.c
@@ -378,7 +378,7 @@ static void bpy_prop_boolean_set_cb(struct PointerRNA *ptr, struct PropertyRNA *
 	}
 }

-static int bpy_prop_poll_cb(struct PointerRNA *self, PointerRNA candidate, struct PropertyRNA *prop)
+static bool bpy_prop_poll_cb(struct PointerRNA *self, PointerRNA candidate, struct PropertyRNA *prop)
 {
 	PyObject *py_self;
 	PyObject *py_candidate;