Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 28 Apr 2018 12:49:08 +0000 (14:49 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 28 Apr 2018 12:49:08 +0000 (14:49 +0200)
commitd5a766a9ed834a72e724aa8bcadb3626619f6ce1
tree4ea292aed42624f166c6d1e575a6240c32e9d56f
parenta74097dc19d1b1d43797fe7dfbc4a2137ad21c22
parent60f4cb24da7462766ea73318f1ff446d803f6319
Merge branch 'master' into blender2.8
source/blender/editors/sculpt_paint/paint_vertex_color_utils.c