[Bf-blender-cvs] [8432aac] object_nodes: 'Value' nodes are actually regular function nodes, not pass-type nodes.

Lukas Tönne noreply at git.blender.org
Thu Dec 10 11:26:30 CET 2015


Commit: 8432aac5f67790ee1b77bea10321fa6c952d7617
Author: Lukas Tönne
Date:   Thu Dec 10 11:21:51 2015 +0100
Branches: object_nodes
https://developer.blender.org/rB8432aac5f67790ee1b77bea10321fa6c952d7617

'Value' nodes are actually regular function nodes, not pass-type nodes.

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

M	source/blender/blenvm/compile/bvm_nodegraph.cc

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

diff --git a/source/blender/blenvm/compile/bvm_nodegraph.cc b/source/blender/blenvm/compile/bvm_nodegraph.cc
index f05bcf8..7d2647d 100644
--- a/source/blender/blenvm/compile/bvm_nodegraph.cc
+++ b/source/blender/blenvm/compile/bvm_nodegraph.cc
@@ -1216,31 +1216,31 @@ static void register_opcode_node_types()
 	nt = NodeGraph::add_function_node_type("ARG_MESH");
 	nt->add_output("value", BVM_MESH);
 	
-	nt = NodeGraph::add_pass_node_type("VALUE_FLOAT");
+	nt = NodeGraph::add_function_node_type("VALUE_FLOAT");
 	nt->add_input("value", BVM_FLOAT, 0.0f, INPUT_CONSTANT);
 	nt->add_output("value", BVM_FLOAT);
 	
-	nt = NodeGraph::add_pass_node_type("VALUE_FLOAT3");
+	nt = NodeGraph::add_function_node_type("VALUE_FLOAT3");
 	nt->add_input("value", BVM_FLOAT3, float3(0.0f, 0.0f, 0.0f), INPUT_CONSTANT);
 	nt->add_output("value", BVM_FLOAT3);
 	
-	nt = NodeGraph::add_pass_node_type("VALUE_FLOAT4");
+	nt = NodeGraph::add_function_node_type("VALUE_FLOAT4");
 	nt->add_input("value", BVM_FLOAT4, float4(0.0f, 0.0f, 0.0f, 0.0f), INPUT_CONSTANT);
 	nt->add_output("value", BVM_FLOAT4);
 	
-	nt = NodeGraph::add_pass_node_type("VALUE_INT");
+	nt = NodeGraph::add_function_node_type("VALUE_INT");
 	nt->add_input("value", BVM_INT, 0, INPUT_CONSTANT);
 	nt->add_output("value", BVM_INT);
 	
-	nt = NodeGraph::add_pass_node_type("VALUE_MATRIX44");
+	nt = NodeGraph::add_function_node_type("VALUE_MATRIX44");
 	nt->add_input("value", BVM_MATRIX44, matrix44::identity(), INPUT_CONSTANT);
 	nt->add_output("value", BVM_MATRIX44);
 	
-	nt = NodeGraph::add_pass_node_type("VALUE_POINTER");
+	nt = NodeGraph::add_function_node_type("VALUE_POINTER");
 	nt->add_input("value", BVM_POINTER, PointerRNA_NULL, INPUT_CONSTANT);
 	nt->add_output("value", BVM_POINTER);
 	
-	nt = NodeGraph::add_pass_node_type("VALUE_MESH");
+	nt = NodeGraph::add_function_node_type("VALUE_MESH");
 	nt->add_input("value", BVM_MESH, __empty_mesh__, INPUT_CONSTANT);
 	nt->add_output("value", BVM_MESH);




More information about the Bf-blender-cvs mailing list