Merge branch 'blender2.7'
authorCampbell Barton <ideasman42@gmail.com>
Tue, 15 Jan 2019 13:27:10 +0000 (00:27 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 15 Jan 2019 13:27:10 +0000 (00:27 +1100)
commit5f22de843953131d4c114644867b8e6fde508ca2
tree87327784141392fb3372ff0fda981106361f953e
parent88a80fcec8672b5bb67041456dc7f7101aae3d55
parent165caafb99c6846e53d11c4e966990aaffc06cea
Merge branch 'blender2.7'
intern/cycles/render/nodes.cpp