Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 25 Jan 2018 09:15:31 +0000 (10:15 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 25 Jan 2018 09:15:31 +0000 (10:15 +0100)
commitfd4d7fbf131a02862b93915d65559d66177a6f18
tree5b0f8d30f77e875da5c3ad508a36c02a37e4a2c1
parent38dafd5f44a07b4937ca53cf67cce4093d5797f7
parent566eb60d817da3e32661efda59b20f6f893ff7cc
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/library_remap.c