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)
commitd891c8f1f802f91629ca63c149f126fd19f9a5d9
treec44f6886e1bf9b494409499699c69a39a1b3d441
parent859d5e56994a8ec274e701a3b6ffae57d848b5c8
parent874f12480f465374e53ee1870cf108828172fe17
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_curves.cpp
intern/cycles/render/nodes.h