Merge pull request #62792 from dpalais/return_option_value

This commit is contained in:
Rémi Verschelde 2022-07-07 10:35:03 +02:00 committed by GitHub
commit 8ec6c075bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -144,11 +144,11 @@ Variant EditorScenePostImportPlugin::get_option_value(const StringName &p_name)
ERR_FAIL_COND_V_MSG(current_options == nullptr && current_options_dict == nullptr, Variant(), "get_option_value called from a function where option values are not available.");
ERR_FAIL_COND_V_MSG(current_options && !current_options->has(p_name), Variant(), "get_option_value called with unexisting option argument: " + String(p_name));
ERR_FAIL_COND_V_MSG(current_options_dict && !current_options_dict->has(p_name), Variant(), "get_option_value called with unexisting option argument: " + String(p_name));
if (current_options) {
(*current_options)[p_name];
if (current_options && current_options->has(p_name)) {
return (*current_options)[p_name];
}
if (current_options_dict) {
(*current_options_dict)[p_name];
if (current_options_dict && current_options_dict->has(p_name)) {
return (*current_options_dict)[p_name];
}
return Variant();
}