[Bf-blender-cvs] [5c9ccf0] object_nodes: Correct types for array 'pass' nodes.

[Lukas Tönne]

Commit: 5c9ccf04a4305fe147fa23240b66e738fda0d6c2
Author: Lukas Tönne
Date:   Tue Dec 22 12:40:19 2015 +0100
Branches: object_nodes
https://developer.blender.org/rB5c9ccf04a4305fe147fa23240b66e738fda0d6c2

Correct types for array 'pass' 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 63b7e0e..ae0b9ca 100644
--- a/source/blender/blenvm/compile/bvm_nodegraph.cc
+++ b/source/blender/blenvm/compile/bvm_nodegraph.cc
@@ -935,32 +935,32 @@ static void register_opcode_node_types()
        nt->add_output("value", TYPE_FLOAT_ARRAY);
        
        nt = NodeGraph::add_pass_node_type("PASS_FLOAT3_ARRAY");
-       nt->add_input("value", TYPE_FLOAT_ARRAY, array<BVM_FLOAT>());
-       nt->add_output("value", TYPE_FLOAT_ARRAY);
+       nt->add_input("value", TYPE_FLOAT3_ARRAY, array<BVM_FLOAT3>());
+       nt->add_output("value", TYPE_FLOAT3_ARRAY);
        
        nt = NodeGraph::add_pass_node_type("PASS_FLOAT4_ARRAY");
-       nt->add_input("value", TYPE_FLOAT_ARRAY, array<BVM_FLOAT>());
-       nt->add_output("value", TYPE_FLOAT_ARRAY);
+       nt->add_input("value", TYPE_FLOAT4_ARRAY, array<BVM_FLOAT4>());
+       nt->add_output("value", TYPE_FLOAT4_ARRAY);
        
        nt = NodeGraph::add_pass_node_type("PASS_INT_ARRAY");
-       nt->add_input("value", TYPE_FLOAT_ARRAY, array<BVM_FLOAT>());
-       nt->add_output("value", TYPE_FLOAT_ARRAY);
+       nt->add_input("value", TYPE_INT_ARRAY, array<BVM_INT>());
+       nt->add_output("value", TYPE_INT_ARRAY);
        
        nt = NodeGraph::add_pass_node_type("PASS_MATRIX44_ARRAY");
-       nt->add_input("value", TYPE_FLOAT_ARRAY, array<BVM_FLOAT>());
-       nt->add_output("value", TYPE_FLOAT_ARRAY);
+       nt->add_input("value", TYPE_MATRIX44_ARRAY, array<BVM_MATRIX44>());
+       nt->add_output("value", TYPE_MATRIX44_ARRAY);
        
        nt = NodeGraph::add_pass_node_type("PASS_STRING_ARRAY");
-       nt->add_input("value", TYPE_FLOAT_ARRAY, array<BVM_FLOAT>());
-       nt->add_output("value", TYPE_FLOAT_ARRAY);
+       nt->add_input("value", TYPE_STRING_ARRAY, array<BVM_STRING>());
+       nt->add_output("value", TYPE_STRING_ARRAY);
        
        nt = NodeGraph::add_pass_node_type("PASS_POINTER_ARRAY");
-       nt->add_input("value", TYPE_FLOAT_ARRAY, array<BVM_FLOAT>());
-       nt->add_output("value", TYPE_FLOAT_ARRAY);
+       nt->add_input("value", TYPE_POINTER_ARRAY, array<BVM_POINTER>());
+       nt->add_output("value", TYPE_POINTER_ARRAY);
        
        nt = NodeGraph::add_pass_node_type("PASS_MESH_ARRAY");
-       nt->add_input("value", TYPE_FLOAT_ARRAY, array<BVM_FLOAT>());
-       nt->add_output("value", TYPE_FLOAT_ARRAY);
+       nt->add_input("value", TYPE_MESH_ARRAY, array<BVM_MESH>());
+       nt->add_output("value", TYPE_MESH_ARRAY);
        
        nt = NodeGraph::add_function_node_type("ARG_FLOAT");
        nt->add_output("value", TYPE_FLOAT);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs