Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 19 Apr 2017 20:11:53 +0000 (22:11 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 19 Apr 2017 20:11:53 +0000 (22:11 +0200)
commit6a5b53fe6f092f9f74d435e84b7617eab6cea250
tree8d6705e12b8ee8bf9aa9a55eba46e4823affcc11
parenta738e985c6d3b5d3803aa3dc5c48b0bd0e4cfa8a
parent1873ea337c24e7a169c306a7467ce899a53eb0f8
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/library_query.c
source/blender/editors/object/object_add.c