Merge branch 'blender2.7'
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 28 Jan 2019 21:27:45 +0000 (22:27 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 28 Jan 2019 21:27:45 +0000 (22:27 +0100)
Conflicts:
source/creator/CMakeLists.txt

1  2 
source/blender/makesrna/intern/rna_mesh.c