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)
commit604de7cbe8401ef781576eb587192a9d71ba35cf
tree91d576119a8ea1ae18e0597be7b0d757e6d4819e
parent91034646c7c93e77c2ffda5e67e5ee0b23207fc9
parent7c64e33b012935764ee5358c0e0a5b983d9a78b0
Merge branch 'master' into blender2.8
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/makesrna.c