summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-01-07 19:48:38 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-01-07 19:48:38 -0300
commit1659f82e7e178c5bd6ff2fe02b600669b427245e (patch)
treefdfef2347baa54a533bbee909c06b67b724953a0 /scene
parent978769cdf1e0f73ff8cef2efd08e5aee538d6e01 (diff)
-changed type of C component of vec interp, fixes #1144
Diffstat (limited to 'scene')
-rw-r--r--scene/resources/shader_graph.cpp5
1 files changed, 4 insertions, 1 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)