Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 19 Apr 2018 16:11:49 +0000 (18:11 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 19 Apr 2018 16:11:49 +0000 (18:11 +0200)
commitbca7563d072f111807fd384d5cf0fcf9d91eccb1
tree36339042217887c6e9aaf3f5f6c5103d8fcf75b8
parentd03024f6b33043c03371efeb04641f4cfcf7cc40
parente2678d6b7b73366777f85b10dc9bd0cc2ee8181e
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/mesh.c
source/blender/makesdna/intern/makesdna.c