diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-01-07 19:48:38 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-07 19:48:38 -0300 |
| commit | 1659f82e7e178c5bd6ff2fe02b600669b427245e (patch) | |
| tree | fdfef2347baa54a533bbee909c06b67b724953a0 | |
| parent | 978769cdf1e0f73ff8cef2efd08e5aee538d6e01 (diff) | |
-changed type of C component of vec interp, fixes #1144
| -rw-r--r-- | scene/resources/shader_graph.cpp | 5 | ||||
| -rw-r--r-- | tools/editor/plugins/shader_graph_editor_plugin.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/scene/resources/shader_graph.cpp b/scene/resources/shader_graph.cpp index 4c81724841..20464704f3 100644 --- a/scene/resources/shader_graph.cpp +++ b/scene/resources/shader_graph.cpp @@ -28,7 +28,9 @@ /*************************************************************************/ #include "shader_graph.h" - +//todo +//-RGB ops +//-mostrar error de conexion Array ShaderGraph::_get_node_list(ShaderType p_type) const { @@ -1418,6 +1420,7 @@ ShaderGraph::SlotType ShaderGraph::get_node_input_slot_type(Mode p_mode, ShaderT if (nsi->type==p_type) { for(int i=0;i<NodeSlotInfo::MAX_INS;i++) { + if (nsi->ins[i]==SLOT_MAX) break; if (i==p_idx) diff --git a/tools/editor/plugins/shader_graph_editor_plugin.cpp b/tools/editor/plugins/shader_graph_editor_plugin.cpp index 54e8268574..5100a8f675 100644 --- a/tools/editor/plugins/shader_graph_editor_plugin.cpp +++ b/tools/editor/plugins/shader_graph_editor_plugin.cpp @@ -1002,7 +1002,7 @@ void ShaderGraphView::_create_node(int p_id) { gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]); gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color()); - gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color()); + gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],false,0,Color()); } break; // vec3 interpolation (with optional curve) case ShaderGraph::NODE_SCALAR_INPUT: { |