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

Simple merge