[Bf-blender-cvs] [7a93fbc] blender-v2.76-release: Fix T46407: Enabling OSL breaks Vector Transform node

Sergey Sharybin noreply at git.blender.org
Fri Oct 9 13:33:25 CEST 2015


Commit: 7a93fbc8071e4d39c173b87b5a44a2b8b22eb19e
Author: Sergey Sharybin
Date:   Thu Oct 8 19:04:15 2015 +0500
Branches: blender-v2.76-release
https://developer.blender.org/rB7a93fbc8071e4d39c173b87b5a44a2b8b22eb19e

Fix T46407: Enabling OSL breaks Vector Transform node

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

M	intern/cycles/blender/blender_shader.cpp

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

diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index fe62890..14c49b4 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -290,7 +290,7 @@ static ShaderNode *add_node(Scene *scene,
 	else if(b_node.is_a(&RNA_ShaderNodeVectorTransform)) {
 		BL::ShaderNodeVectorTransform b_vector_transform_node(b_node);
 		VectorTransformNode *vtransform = new VectorTransformNode();
-		vtransform->type = VectorTransformNode::type_enum[b_vector_transform_node.type()];
+		vtransform->type = VectorTransformNode::type_enum[b_vector_transform_node.vector_type()];
 		vtransform->convert_from = VectorTransformNode::convert_space_enum[b_vector_transform_node.convert_from()];
 		vtransform->convert_to = VectorTransformNode::convert_space_enum[b_vector_transform_node.convert_to()];
 		node = vtransform;




More information about the Bf-blender-cvs mailing list