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)
commitdc123ac9e5a135f018ebceda4d282346a8bba094
tree46956d1312804c51550cc86df3f8099eec9663aa
parent3465013bb7d6c211d9d5acbba7cf47697f63ba9e
parent1e1c858cf1bf900f0876b13f922beb0e2aeb0e8c
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/makesdna/DNA_meshdata_types.h