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)
commit6d55b522feb61a6cc03d04cbc2fca23713964084
treeca59c77a7db79e09d08b15f585fa90ae763f7a00
parentafaca68ea86edd921f40cf45c245eaf8b5fc053a
parent87608e66e174068f9471619a5fe153fd279c4947
Merge branch 'master' into blender2.8
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c