Merge branch 'master' into greasepencil-object
authorAntonioya <blendergit@gmail.com>
Thu, 9 May 2019 11:28:24 +0000 (13:28 +0200)
committerAntonioya <blendergit@gmail.com>
Thu, 9 May 2019 11:28:24 +0000 (13:28 +0200)
commitb914af26a26f5b4248e0cea1b2d417a1b10ee7b2
tree9d64c08d022eb445fda8bae343b598b81ac42614
parentccd176046f61c8532aefd92bc2d7b131b141cd44
parent8342a124c462104c12a98cca0b16e69920316346
Merge branch 'master' into greasepencil-object
source/blender/makesdna/DNA_object_types.h