Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 25 Apr 2018 12:54:34 +0000 (14:54 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 25 Apr 2018 12:54:34 +0000 (14:54 +0200)
commit4b8d7a143e491611581dc1e749e34eaec67e4377
treed1e980c613767e9a298e907a2c8cff29518a798f
parentcdfc4c0d1dbb6ae2dde8dd262cab5b69e9389b7c
parent13b6867d1fd21721bfd1a46501815faa6f6fa375
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/cdderivedmesh.c