sascha
/
godot
mirror of https://github.com/godotengine/godot.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Do not make a function that returns Variant::NIL a void function. Fix #22791.

pull/22899/head
J08nY 2018-10-10 00:50:47 +07:00
parent 4c1a5d9cfe
commit 6e8f0cfdc6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gdscript/gdscript_parser.cpp
Unescape Escape View File

@ -6709,9 +6709,15 @@ GDScriptParser::DataType GDScriptParser::_reduce_function_call_type(const Operat
} }
} }
bool rets = false;
return_type.has_type = true; return_type.has_type = true;
return_type.kind = DataType::BUILTIN; return_type.kind = DataType::BUILTIN;
return_type.builtin_type = Variant::get_method_return_type(base_type.builtin_type, callee_name); return_type.builtin_type = Variant::get_method_return_type(base_type.builtin_type, callee_name, &rets);
// If the method returns, but it might return any type, (Variant::NIL), pretend we don't know the type.
// At least make sure we know that it returns
if (rets && return_type.builtin_type == Variant::NIL) {
return_type.has_type = false;
}
break; break;
} }