Merge branch 'blender2.7'
authorJeroen Bakker <j.bakker@atmind.nl>
Thu, 14 Mar 2019 08:31:20 +0000 (09:31 +0100)
committerJeroen Bakker <j.bakker@atmind.nl>
Thu, 14 Mar 2019 08:31:20 +0000 (09:31 +0100)
commit687e4b42d503de8cca77d74cc3449911fbd37bf6
tree5c8b27f27ad8607b841687e390b00477d8664616
parent05fbb0d50eee8c5599da3e93d14c95c191ddeb51
parent4887baf7d69c6c44c265044600ec00c77e9aa406
Merge branch 'blender2.7'
intern/cycles/render/nodes.cpp
intern/cycles/render/nodes.h