summaryrefslogtreecommitdiffstats
path: root/servers/visual/shader_language.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-06-17 11:03:48 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-06-17 11:03:48 -0300
commit2da3f48e5a3025ca985a0a7305c0c7ffa9ac1f17 (patch)
treeb9a871882410af65015526c1560cfea6ca01e528 /servers/visual/shader_language.cpp
parent9757fc354cc4c1052f7023b2d1613a5333cc0cd2 (diff)
downloadredot-engine-2da3f48e5a3025ca985a0a7305c0c7ffa9ac1f17.tar.gz
-Fixed shader lang to not be able to get scalar from matrix (ie mat.x), to make it more GLSL compatible
-Fixed referencing of world_transform in fragment shader not working -Fixed unsycn bug related to getting shader param list from the server -Fixed getting all textures from shader properly, fixes #8353
Diffstat (limited to 'servers/visual/shader_language.cpp')
-rw-r--r--servers/visual/shader_language.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp
index 319351f8ec..96d56dfc56 100644
--- a/servers/visual/shader_language.cpp
+++ b/servers/visual/shader_language.cpp
@@ -2549,12 +2549,14 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
} break;
- default: {}
+ default: {
+ ok = false;
+ }
}
if (!ok) {
- _set_error("Invalid member for expression: ." + ident);
+ _set_error("Invalid member for " + get_datatype_name(dt) + " expression: ." + ident);
return NULL;
}