Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Thu, 6 Oct 2016 22:22:21 +0000 (00:22 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Thu, 6 Oct 2016 22:22:21 +0000 (00:22 +0200)
commit553b4faac8b4e766e4680c77e18b21bfccbb8506
tree69e5544729608d6b4081d3cb7b3a3db29376c659
parentffc46668c41337e562e97f62ceaeedd0c6a2e4ef
parentec6b593072e461b99543fc1c839766c9e99779ab
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/object.c
source/blender/editors/interface/interface_widgets.c