Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 17 Mar 2019 11:54:19 +0000 (12:54 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 17 Mar 2019 11:54:19 +0000 (12:54 +0100)
commite69192968616b17709e6a3bd0d2dc59d463c52ba
tree4018a1dc7f631ad340b11c0b738fade9f24d0c6e
parent0af22625c9f9357e873160d265b9eae4a43a549d
parent9d2397c710af9180e7e2ec6db42e8513390b4ab1
Merge branch 'blender2.7'
build_files/buildbot/slave_compile.py
intern/cycles/blender/blender_sync.cpp
intern/cycles/device/device.h
intern/cycles/device/device_cpu.cpp
intern/cycles/device/device_cuda.cpp
intern/cycles/render/light.cpp
intern/cycles/render/shader.cpp
tests/python/CMakeLists.txt