Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 29 Nov 2017 02:44:59 +0000 (13:44 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 29 Nov 2017 02:44:59 +0000 (13:44 +1100)
commitf89563a806479bd609a894a91dfb1756999fe562
tree990ce835f24baab4214d2e9d3d4cd867967b1f3b
parent2f80fbbac3f2d2457c1237e94489ac6441215edb
parent0b325ba201269b3c8aab6e61c70f15c1758737d8
Merge branch 'master' into blender2.8
source/blender/python/intern/bpy_props.c