Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 31 Jan 2018 08:03:45 +0000 (19:03 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 31 Jan 2018 08:03:45 +0000 (19:03 +1100)
1  2 
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c