Merge branch 'blender2.7'
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 8 Jan 2019 10:47:35 +0000 (11:47 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 8 Jan 2019 10:47:35 +0000 (11:47 +0100)
commit68b4c57ba5cd231694b0d9b4572a4e1b364f5055
tree0cc783cf0a4fb6999eca193a38e72bbccb60ddd0
parentf2d2bafe8569188d00d5f68da296bd3279e2b243
parent1e386d98ced39c181f7331550028474716ab48b3
Merge branch 'blender2.7'
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/makesrna.c