summaryrefslogtreecommitdiffstats
path: root/servers/visual/shader_language.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <red@kyoko>2015-05-21 15:02:49 -0300
committerJuan Linietsky <red@kyoko>2015-05-21 15:02:49 -0300
commitbb5d46bb113bca3204db7678eb69900f159e8087 (patch)
treecd34e10d67a196d217559ab8d4973b8f5bc4ccde /servers/visual/shader_language.cpp
parent4b8745ad63409cf14b02735981ee35d2f794421c (diff)
parent6049479a99f66b620d59498a76ed9f2c3891f4c8 (diff)
downloadredot-engine-bb5d46bb113bca3204db7678eb69900f159e8087.tar.gz
Merge branch 'master' of https://github.com/okamstudio/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 77b7ddbc93..ea56306241 100644
--- a/servers/visual/shader_language.cpp
+++ b/servers/visual/shader_language.cpp
@@ -1714,7 +1714,7 @@ Error ShaderLanguage::parse_expression(Parser& parser,Node *p_parent,Node **r_ex
if (!existing) {
- parser.set_error("Unexisting identifier in expression: "+identifier);
+ parser.set_error("Nonexistent identifier in expression: "+identifier);
return ERR_PARSE_ERROR;
}