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)
1  2 
intern/cycles/render/nodes.cpp
intern/cycles/render/nodes.h

Simple merge
Simple merge