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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2016-06-18 23:36:42 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2016-06-18 23:37:18 +0300
commit7da189b4e8b1afed32716b6b2c127a93a35d498e (patch)
tree8ba0f638ca4407713f1d759479c582a051d65abd
parent2465bd90d5a12fbb074f25898ca3f4a6c6def953 (diff)
Fix broken combine XYZ node after recent refactoring.
-rw-r--r--intern/cycles/render/nodes.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index bcaeaa9e6b4..6498de70a36 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -3761,7 +3761,7 @@ NODE_DEFINE(CombineXYZNode)
SOCKET_IN_FLOAT(y, "Y", 0.0f);
SOCKET_IN_FLOAT(z, "Z", 0.0f);
- SOCKET_OUT_COLOR(color, "Image");
+ SOCKET_OUT_VECTOR(vector, "Vector");
return type;
}