Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 30 Jan 2019 17:36:54 +0000 (18:36 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 30 Jan 2019 17:36:54 +0000 (18:36 +0100)
commitf4b1f1f0beece897df0a9013adf2253e89a85975
tree936e13ede178105f13396008076db7a955bc97a9
parentab682b15582bfc2e550f979c34f2f2b27629ea3d
parent001414fb2f7346d2ff332bf851373522d87659d7
Merge branch 'blender2.7'
intern/cycles/blender/addon/properties.py
intern/cycles/blender/blender_python.cpp
intern/cycles/blender/blender_sync.cpp
intern/cycles/device/device.cpp
intern/cycles/device/device.h