Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 20 Mar 2018 10:33:59 +0000 (11:33 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 20 Mar 2018 10:33:59 +0000 (11:33 +0100)
commit04b8b1a167c332937a244fb88340d60fa9182efd
treef4ca72a1049bd5c75acfeb8f99487747e46cff95
parent1662c514c01f0b85f67e8d52bebc6abce47cb8b4
parent60ff803998360c8a83c3f740342c44124ec277ff
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/material.c