[Bf-blender-cvs] [7da189b] master: Fix broken combine XYZ node after recent refactoring.

[Brecht Van Lommel]

Commit: 7da189b4e8b1afed32716b6b2c127a93a35d498e
Author: Brecht Van Lommel
Date:   Sat Jun 18 22:36:42 2016 +0200
Branches: master
https://developer.blender.org/rB7da189b4e8b1afed32716b6b2c127a93a35d498e

Fix broken combine XYZ node after recent refactoring.

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

M	intern/cycles/render/nodes.cpp

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

diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index bcaeaa9..6498de7 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;
 }