Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 11 Jan 2018 19:19:18 +0000 (20:19 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 11 Jan 2018 19:19:18 +0000 (20:19 +0100)
commit8bff6f319a1f562e6d3595468a9ddba7bfec931c
treea04606dd2bab058b539eeae3727673b527b1584e
parentda97b6930b47555fbc526b7165d5b73abe06252d
parent610459658777e73e50671ddbcebd70294a6ad76e
Merge branch 'master' into blender2.8

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