Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 13 Feb 2019 13:34:26 +0000 (14:34 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 13 Feb 2019 13:34:26 +0000 (14:34 +0100)
commit74a3d9b410e671b81b6b41e16dd9b158882521d3
treedd34df2dee0f6b47739434a363504bf20ba31d34
parent1bbe770030a93c38e4fd95f4e65009385c33ab34
parent3866161da855d2b35ac48ef55958bcb567d4a740
Merge branch 'blender2.7'
intern/cycles/device/device.cpp
source/blender/makesrna/intern/makesrna.c