Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 28 Nov 2017 09:35:24 +0000 (20:35 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 28 Nov 2017 09:35:24 +0000 (20:35 +1100)
1  2 
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/makesrna.c