godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

merges from okam repo

Browse Source
This commit is contained in:
Juan Linietsky
2015-03-03 14:39:13 -03:00
parent 91faf8e218
commit 4d2198110b
28 changed files with 458 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
servers/visual/shader_language.cpp
View File

@@ -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);