Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 1 Aug 2017 05:00:49 +0000 (15:00 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 1 Aug 2017 05:00:49 +0000 (15:00 +1000)
commita108d81af966e4d6b2f29fadcfb28b4084276ad1
tree22364dd568be1012e2af887019b47eaee7a27fb9
parent4c38d84e738fbe0e5324313c68f2e7eacc4ca1fb
parent702e9c556fcab7bf1f9dc9738f0b580f2963396a
Merge branch 'master' into blender2.8
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_sculpt_paint.c