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)
1  2 
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/object.c
source/blender/editors/interface/interface_widgets.c