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)
commita1c45a453f55fd61072ff31566654cbd03e92428
tree06381c98af570ad348d58bb4b78a7d6fa944188a
parent23d2f708f312b73186aff4a42e952480413e7096
parentf911fb0744a8185745193a252b4115a6d7756102
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_paint.h
source/blender/editors/util/ed_util.c