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)
Conflicts:
source/blender/blenkernel/intern/library_remap.c


No differences found