Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 7 Jun 2018 16:45:45 +0000 (18:45 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 7 Jun 2018 16:45:45 +0000 (18:45 +0200)
commit3b556a477d0741eb26d10a2e91979353346011f7
tree51de1de36a164433f04e4a2a174d74c156d50b70
parent5593baea1bb51d7423b9413606efbdc6004093fd
parent80dcb2ced8a06caf6c47cb9c767214db33140fcb
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/sculpt_paint/sculpt_undo.c
source/blender/blenkernel/intern/paint.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/sculpt_paint/sculpt_undo.c