Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 23 Nov 2018 13:41:21 +0000 (14:41 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 23 Nov 2018 13:41:21 +0000 (14:41 +0100)
1  2 
intern/cycles/blender/blender_curves.cpp
intern/cycles/render/nodes.h

Simple merge