Merge pull request #52591 from timothyqiu/error-macros

[3.x] Remove do{ } while(0) wrapper around error macros
This commit is contained in:
Rémi Verschelde 2021-09-21 10:38:34 +02:00 committed by GitHub
commit b37776fa2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 209 additions and 230 deletions

View file

@ -1675,8 +1675,7 @@ bool CSharpInstance::has_method(const StringName &p_method) const {
}
Variant CSharpInstance::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
if (!script.is_valid())
ERR_FAIL_V(Variant());
ERR_FAIL_COND_V(!script.is_valid(), Variant());
GD_MONO_SCOPE_THREAD_ATTACH;