Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 5 Feb 2018 06:58:31 +0000 (17:58 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 5 Feb 2018 06:58:31 +0000 (17:58 +1100)
1  2 
source/blender/blenkernel/BKE_paint.h
source/blender/editors/util/ed_util.c

Simple merge
Simple merge