Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 26 Feb 2019 19:07:36 +0000 (20:07 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 26 Feb 2019 19:07:36 +0000 (20:07 +0100)
commit4d9697a5a90de08d30de373cf6dc83f8130fffdc
tree8c4d4b7d2a06f4a9aad42f767035161b20f74518
parent2977eb5a0e7e53531a156136e7c7df6022b6d684
parent6b6d1e424c5b85d685d4aa8fa65cd22cd92939be
Merge branch 'blender2.7'
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_ID.h