diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-03-03 14:39:13 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-03-03 14:39:13 -0300 |
| commit | 4d2198110b4af7f203eeef95697255569e49bce7 (patch) | |
| tree | 452e4964f127643bf52610718fd956d8b55ed6ba /servers | |
| parent | 91faf8e21810c8995e4f6e3b6ba47a6482ab877e (diff) | |
merges from okam repo
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/visual/shader_language.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index 9a76a009a9..30499ca210 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -2058,7 +2058,9 @@ Error ShaderLanguage::parse_expression(Parser& parser,Node *p_parent,Node **r_ex at+=get_datatype_name(compute_node_type(op->arguments[i])); } - parser.set_error("Invalid arguments to operator "+String(token_names[op->op])+": "+at); + static const char *op_names[OP_MAX]={"=","+","-","*","/","+=","-=","*=","/=","-","!","==","!=","<=",">=","<",">","||","&&","call","()"}; + + parser.set_error("Invalid arguments to operator "+String(op_names[op->op])+": "+at); return ERR_PARSE_ERROR; } expression.remove(next_op); |