From 2da3f48e5a3025ca985a0a7305c0c7ffa9ac1f17 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 17 Jun 2017 11:03:48 -0300 Subject: -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 --- servers/visual/shader_language.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'servers/visual/shader_language.cpp') 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; } -- cgit v1.2.3