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

-Treat scalar conversions when calling functions as error, closes #24261

Browse Source 
-Make shader editor display errors if exist when just opening it
-Make ShaderMaterial not lose parameters if opened in error.
This commit is contained in:
Juan Linietsky
2019-02-23 17:52:49 -03:00
parent 07fbc34195
commit fd68bb2596
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
servers/visual/shader_language.cpp
View File

@@ -2074,9 +2074,7 @@ bool ShaderLanguage::_validate_function_call(BlockNode *p_block, OperatorNode *p
bool fail = false;
for (int i = 0; i < argcount; i++) {
if (get_scalar_type(args[i]) == args[i] && p_func->arguments[i + 1]->type == Node::TYPE_CONSTANT && convert_constant(static_cast<ConstantNode *>(p_func->arguments[i + 1]), builtin_func_defs[idx].args[i])) {
//all good
} else if (args[i] != builtin_func_defs[idx].args[i]) {
if (args[i] != builtin_func_defs[idx].args[i]) {
fail = true;
break;
}
@@ -2186,9 +2184,7 @@ bool ShaderLanguage::_validate_function_call(BlockNode *p_block, OperatorNode *p
for (int j = 0; j < args.size(); j++) {
if (get_scalar_type(args[j]) == args[j] && p_func->arguments[j + 1]->type == Node::TYPE_CONSTANT && convert_constant(static_cast<ConstantNode *>(p_func->arguments[j + 1]), pfunc->arguments[j].type)) {
//all good
} else if (args[j] != pfunc->arguments[j].type) {
if (args[j] != pfunc->arguments[j].type) {
fail = true;
break;
}