Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 18 Jan 2019 20:00:24 +0000 (21:00 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 18 Jan 2019 20:00:24 +0000 (21:00 +0100)
commitc59370bf643f6e85473c560c8f5edcf73cc36e8e
tree01339cabbc8ed3f877198e7d2c7364847951be29
parentbe8202d90bd9bd8e87d5111c45fb412925b2d472
parent08871b56bc4db884ce127deb0ea247e740efe813
Merge branch 'blender2.7'
CMakeLists.txt
build_files/cmake/config/blender_release.cmake
intern/cycles/render/shader.cpp