summaryrefslogtreecommitdiffstats
path: root/core/variant/variant.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-04-27 10:08:26 +0200
committerGitHub <noreply@github.com>2022-04-27 10:08:26 +0200
commit8dfa12cae729258155fbad51ed41f1bb3ad1006a (patch)
tree15a556638bbff71f35e8b42879ccd6570e1f64fb /core/variant/variant.cpp
parentf8cfff2aa6adcb2665f237d487611f8b2a63099f (diff)
parentde4c97758af117af97fad58e4a80ffeba0154ba8 (diff)
downloadredot-engine-8dfa12cae729258155fbad51ed41f1bb3ad1006a.tar.gz
Merge pull request #59979 from bruvzg/cpp_check2
Diffstat (limited to 'core/variant/variant.cpp')
-rw-r--r--core/variant/variant.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/variant/variant.cpp b/core/variant/variant.cpp
index b3e909b489..da5d73d519 100644
--- a/core/variant/variant.cpp
+++ b/core/variant/variant.cpp
@@ -184,7 +184,7 @@ bool Variant::can_convert(Variant::Type p_type_from, Variant::Type p_type_to) {
if (p_type_from == p_type_to) {
return true;
}
- if (p_type_to == NIL && p_type_from != NIL) { //nil can convert to anything
+ if (p_type_to == NIL) { //nil can convert to anything
return true;
}
@@ -490,7 +490,7 @@ bool Variant::can_convert_strict(Variant::Type p_type_from, Variant::Type p_type
if (p_type_from == p_type_to) {
return true;
}
- if (p_type_to == NIL && p_type_from != NIL) { //nil can convert to anything
+ if (p_type_to == NIL) { //nil can convert to anything
return true;
}