Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 2 Aug 2018 07:52:22 +0000 (17:52 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 2 Aug 2018 07:52:22 +0000 (17:52 +1000)
commitd3c387d605470838e8f8349fa37c4b123e3e0471
tree3a098583b4c7888146021c19bf9bca19594e903b
parent503866c68154ef09e6199068391515f81eebaa2d
parentcb6d7cb0b255b9018620c4b11da8ed0044b1288f
Merge branch 'master' into blender2.8
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/rna_sculpt_paint.c