Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 15 Mar 2019 17:31:48 +0000 (18:31 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 15 Mar 2019 17:31:48 +0000 (18:31 +0100)
commitbc8bd87dfffe44cd5b9053800f086704ff880f6a
treed7ddf4bab0c5a953a6d0d4672f3d1d4c64c38a35
parent5051e580e4028e0a741e6519e469321a7e1f2a71
parent65d95879f73951861a90efe1c3ac5d1d03530fd6
Merge branch 'blender2.7'
build_files/buildbot/slave_compile.py
build_files/cmake/config/blender_release.cmake
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/version_update.py
intern/cycles/device/device_cuda.cpp