Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 15 Jun 2018 14:32:31 +0000 (16:32 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 15 Jun 2018 14:32:31 +0000 (16:32 +0200)
commit23b3901057c65269710e810845908ab935cefe06
tree7d9c4233c3126ac012294f0c1b0dc1f356f7eaee
parentbadb7001612605bb631c8252d5aee30d50fb98ee
parent2e25a48b05004112344b04cd56760709eebfc1a4
Merge branch 'master' into blender2.8
intern/cycles/render/shader.cpp