Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 25 Apr 2019 12:31:45 +0000 (14:31 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 25 Apr 2019 12:31:45 +0000 (14:31 +0200)
commitb77c10b45c3f46320977e2c64116aca5ac979fdb
treea75820f2054a8c9f2e1d3bdd8b0161b9bfbd19ac
parent10c4bde79272add4ae4a26c18ee1013032d277a0
parent2adf4b401ed289a3f9f3863b1bf5abb52d61f148
Merge branch 'blender2.7'
intern/cycles/render/attribute.cpp