Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 28 Jan 2018 06:18:56 +0000 (17:18 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 28 Jan 2018 06:18:56 +0000 (17:18 +1100)
commitdfbe4153721b6764a41c2e8de8f41c6cdab6fe7e
tree9d753f9c88620ead520281b545cf863f479ebeec
parent1c905046d1da3a37993376f34f9a438244f4a1f3
parentbff1dae7675f67717591e5f8d44b142fee331c2d
Merge branch 'master' into blender2.8
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/makesrna/intern/rna_mesh.c