Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Stockner <lukas.stockner@freenet.de>2016-06-17 06:20:47 +0300
committerLukas Stockner <lukas.stockner@freenet.de>2016-06-17 06:20:47 +0300
commitf0c7a2a25cfc905fa00e5551f6bd614159de589f (patch)
tree3f7d0b90539c358308db59776387dc9732a7ec1c /intern/cycles
parentd747bfbe298327a01f03a0c7d1183c98f4c85f4e (diff)
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.
Diffstat (limited to 'intern/cycles')
-rw-r--r--intern/cycles/render/nodes.cpp4
1 files changed, 2 insertions, 2 deletions
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;
}