From f0c7a2a25cfc905fa00e5551f6bd614159de589f Mon Sep 17 00:00:00 2001 From: Lukas Stockner Date: Fri, 17 Jun 2016 05:20:47 +0200 Subject: Fix T48657: Incorrect render with Cycles (CPU) using texture The sockets of the RGB to BW node were set to the wrong type after the recent node refactor. --- intern/cycles/render/nodes.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/cycles') diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 1157a1297ef..a2e51713d65 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -1564,8 +1564,8 @@ NODE_DEFINE(RGBToBWNode) { NodeType* type = NodeType::add("rgb_to_bw", create, NodeType::SHADER); - SOCKET_IN_POINT(color, "Color", make_float3(0.0f, 0.0f, 0.0f)); - SOCKET_OUT_POINT(val, "Val"); + SOCKET_IN_COLOR(color, "Color", make_float3(0.0f, 0.0f, 0.0f)); + SOCKET_OUT_FLOAT(val, "Val"); return type; } -- cgit v1.2.3