Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 19 Jun 2018 06:56:45 +0000 (08:56 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 19 Jun 2018 06:56:45 +0000 (08:56 +0200)
commit7a3e037dc0dc9e10141c5a6c5e8c149bdb530dc2
treea47dc43847253a201fe8c84a7cadbe693848e701
parentbd3fe54b0d1fae577813d1b2850d5da57dbb1fe5
parent751189e9d6828368614fe3f517a80ddb95f8c547
Merge branch 'master' into blender2.8
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c