Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 13 Mar 2019 17:37:09 +0000 (18:37 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 13 Mar 2019 17:37:09 +0000 (18:37 +0100)
commit2d4a4fa0c1b617a8d68299c6d4501306867d51fa
treea109ae3a33cbce162fee201289ea5faa29414759
parent18a9e0776c2e9400449a43f28707cc3e62b0c160
parent6eeac735f2425ce4dffaee747b7e8823a793e464
Merge branch 'blender2.7'
intern/cycles/render/shader.cpp