Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 18 Feb 2018 18:29:17 +0000 (19:29 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 18 Feb 2018 18:59:27 +0000 (19:59 +0100)
commit569273c23454bbd20fb060787bd733163dc444dc
tree1b277d90d29f1d7be7d55f4d866e4247464653e2
parent2bc952fdb6e1474e9e568224a37bcf5cff874aaf
parent1beb6b43c162f657607b49df9d583b38a160d683
Merge branch 'master' into blender2.8
source/blender/makesrna/intern/rna_object.c