diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-27 16:48:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-27 16:48:09 +0200 |
commit | 4cf5bb027678717263476e676cd23f881eef1ca1 (patch) | |
tree | a842d54e82a4998c8b593f86fef858560c10b4d2 /modules/gdscript/gdscript_function.cpp | |
parent | cb5a62903f9798da8b12f625cbd5a493f14e41d3 (diff) | |
parent | cdc411fd54fbafc414b29abb1d50a0ff327f0d89 (diff) | |
download | redot-engine-4cf5bb027678717263476e676cd23f881eef1ca1.tar.gz |
Merge pull request #22446 from akien-mga/fix-warnings
Fix various warnings raised by GCC 5
Diffstat (limited to 'modules/gdscript/gdscript_function.cpp')
-rw-r--r-- | modules/gdscript/gdscript_function.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_function.cpp b/modules/gdscript/gdscript_function.cpp index abd08d13ff..b935861652 100644 --- a/modules/gdscript/gdscript_function.cpp +++ b/modules/gdscript/gdscript_function.cpp @@ -789,7 +789,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a #ifdef DEBUG_ENABLED GDScriptNativeClass *nc = Object::cast_to<GDScriptNativeClass>(type->operator Object *()); GD_ERR_BREAK(!nc); - if (!src->get_type() != Variant::OBJECT && !src->get_type() != Variant::NIL) { + if (src->get_type() != Variant::OBJECT && src->get_type() != Variant::NIL) { err_text = "Trying to assign value of type '" + Variant::get_type_name(src->get_type()) + "' to a variable of type '" + nc->get_name() + "'."; OPCODE_BREAK; |