summaryrefslogtreecommitdiff
path: root/servers/visual/shader_language.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-11-28 20:57:23 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-11-28 20:57:23 -0300
commit68aaa0f813bed1e33a55b05d70c560023a3d0c6a (patch)
tree91a4400e48eb2183d4b15ea526a2f253017fb210 /servers/visual/shader_language.cpp
parent7aa39b7cae364347cf379bb8f216adf0a79f37c7 (diff)
parent68c56f81f9f77f1296826be382958e2ecc38826b (diff)
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'servers/visual/shader_language.cpp')
-rw-r--r--servers/visual/shader_language.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp
index 6c5f64edd9..68a60e26f5 100644
--- a/servers/visual/shader_language.cpp
+++ b/servers/visual/shader_language.cpp
@@ -1370,7 +1370,7 @@ ShaderLanguage::Node* ShaderLanguage::validate_function_call(Parser&parser, Oper
}
}
- if (!fail) {
+ if (!fail && name == program->functions[i].name) {
p_func->return_cache=pfunc->return_type;
return p_func;
}