diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-07 13:01:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 13:01:23 +0100 |
| commit | 0593daa826400c1e177c87e1b111fa2b5caa2853 (patch) | |
| tree | a69f2f38374c9f080b9c00fdcf39999ad5cc9261 | |
| parent | da913f2675479078b6fea6d749c95aaf48643e1e (diff) | |
| parent | b2617e72e5d76f8e35607b46d1c7b184df95e8cd (diff) | |
Merge pull request #15382 from mrcdk/poolarrays_neq_fix
Fix NEQ operation for Arrays and Pool*Arrays
| -rw-r--r-- | core/variant_op.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/variant_op.cpp b/core/variant_op.cpp index 662371b107..e46fac77ee 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -339,7 +339,7 @@ bool Variant::booleanize() const { CASE_TYPE(m_prefix, m_op_name, m_name) { \ if (p_b.type == NIL) \ _RETURN(true) \ - DEFAULT_OP_ARRAY_OP_BODY(m_prefix, m_op_name, m_name, m_type, !=, ==, true, true, false) \ + DEFAULT_OP_ARRAY_OP_BODY(m_prefix, m_op_name, m_name, m_type, !=, !=, false, true, true) \ } #define DEFAULT_OP_ARRAY_LT(m_prefix, m_op_name, m_name, m_type) \ @@ -539,12 +539,12 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, if (arr_b->size() != l) _RETURN(true); for (int i = 0; i < l; i++) { - if (((*arr_a)[i] == (*arr_b)[i])) { - _RETURN(false); + if (((*arr_a)[i] != (*arr_b)[i])) { + _RETURN(true); } } - _RETURN(true); + _RETURN(false); } DEFAULT_OP_NUM_NULL(math, OP_NOT_EQUAL, INT, !=, _int); |