diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-04 14:56:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-04 14:56:38 +0100 |
| commit | bb8c4acdc9f07d318154a95331c4f77b00825bf5 (patch) | |
| tree | 321c99cc15f2506753c0a69db6e36ce4bff4e7b3 /modules/gdscript/gdscript_analyzer.cpp | |
| parent | e133adeb8ca8d89a51b583e9160cbded34e3c3cf (diff) | |
| parent | d45c3cdd1db4ae6f3d30f87deb6c170a62fe4bcb (diff) | |
| download | redot-engine-bb8c4acdc9f07d318154a95331c4f77b00825bf5.tar.gz | |
Merge pull request #58185 from V-Sekai/explicit_variant_assignment_fix
Diffstat (limited to 'modules/gdscript/gdscript_analyzer.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_analyzer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp index 1a841b2a0f..3ff8b2b91a 100644 --- a/modules/gdscript/gdscript_analyzer.cpp +++ b/modules/gdscript/gdscript_analyzer.cpp @@ -1424,7 +1424,7 @@ void GDScriptAnalyzer::resolve_variable(GDScriptParser::VariableNode *p_variable parser->push_warning(p_variable->initializer, GDScriptWarning::NARROWING_CONVERSION); #endif } - if (p_variable->initializer->get_datatype().is_variant()) { + if (p_variable->initializer->get_datatype().is_variant() && !type.is_variant()) { // TODO: Warn unsafe assign. mark_node_unsafe(p_variable->initializer); p_variable->use_conversion_assign = true; |