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)
commita9c297165878b3c427a20f787cc90a6ada4df253
treeb3face676ed2f8c07b76b5cf96c680c2023e788f
parent491a98ca44297555c97e4dcc5ed5bf7b2dc0661d
parente63869ca802a59e80989c255776f86ad8289cf56
Merge branch 'blender2.7'

Conflicts:
source/creator/CMakeLists.txt
source/blender/makesrna/intern/rna_mesh.c