Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sat, 6 Aug 2016 10:57:21 +0000 (12:57 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sat, 6 Aug 2016 10:57:21 +0000 (12:57 +0200)
commit3eae585791fb15db6cc0a081b30bb6a78b4f82bf
treeb163d1b1c2844782159b918d95f83e6e2949b18d
parent9843921288307be33fc39450586ff9ad226829a1
parent566dd4e8a5091ba07c95ad49e891a0b4a3ee8ce2
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/library_query.c
source/blender/editors/object/object_relations.c