Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Jul 2018 14:18:43 +0000 (16:18 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Jul 2018 14:18:43 +0000 (16:18 +0200)
1  2 
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/makesdna/DNA_meshdata_types.h