Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 10 May 2018 12:27:24 +0000 (14:27 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 10 May 2018 12:27:24 +0000 (14:27 +0200)
commitc20cc3cf14be322f76db5f76d273b55408233802
tree8873bd5893d84871af70d95574d76eb4c343cbd1
parent27da2db0caf77b2f4cae443c3d3146d517a1cc4b
parent0385b33f0b3e389ea2a82c4b6bb181c684f0511a
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/library.c