Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 28 Jun 2016 11:10:11 +0000 (21:10 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 28 Jun 2016 11:10:11 +0000 (21:10 +1000)
1  2 
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_userdef.c