[Bf-blender-cvs] [f0c7a2a] master: Fix T48657: Incorrect render with Cycles (CPU) using texture

[Lukas Stockner]

Commit: f0c7a2a25cfc905fa00e5551f6bd614159de589f
Author: Lukas Stockner
Date:   Fri Jun 17 05:20:47 2016 +0200
Branches: master
https://developer.blender.org/rBf0c7a2a25cfc905fa00e5551f6bd614159de589f

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.

===================================================================

M	intern/cycles/render/nodes.cpp

===================================================================

diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 1157a12..a2e5171 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;
 }