diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2020-11-06 14:24:38 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-06 14:24:38 -0300 |
| commit | 207f8c08b3f161ea0e84c3f51d4c86662633b5c9 (patch) | |
| tree | 1eb1930e9124c5ecf77840e80ebed64cbb85608c /editor/dependency_editor.cpp | |
| parent | 391d29f558d122798416b5957660d9eeceecd0f5 (diff) | |
| parent | f2397809a84c2bf0d41e6cb2092fa8f3c5a17850 (diff) | |
Merge pull request #43323 from reduz/variant-bind-rework2
Refactored Variant Operators.
Diffstat (limited to 'editor/dependency_editor.cpp')
| -rw-r--r-- | editor/dependency_editor.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index cbf39c209a..5e87f866d8 100644 --- a/editor/dependency_editor.cpp +++ b/editor/dependency_editor.cpp @@ -471,28 +471,28 @@ void DependencyRemoveDialog::ok_pressed() { // If the file we are deleting for e.g. the main scene, default environment, // or audio bus layout, we must clear its definition in Project Settings. - if (files_to_delete[i] == ProjectSettings::get_singleton()->get("application/config/icon")) { + if (files_to_delete[i] == String(ProjectSettings::get_singleton()->get("application/config/icon"))) { ProjectSettings::get_singleton()->set("application/config/icon", ""); } - if (files_to_delete[i] == ProjectSettings::get_singleton()->get("application/run/main_scene")) { + if (files_to_delete[i] == String(ProjectSettings::get_singleton()->get("application/run/main_scene"))) { ProjectSettings::get_singleton()->set("application/run/main_scene", ""); } - if (files_to_delete[i] == ProjectSettings::get_singleton()->get("application/boot_splash/image")) { + if (files_to_delete[i] == String(ProjectSettings::get_singleton()->get("application/boot_splash/image"))) { ProjectSettings::get_singleton()->set("application/boot_splash/image", ""); } - if (files_to_delete[i] == ProjectSettings::get_singleton()->get("rendering/environment/default_environment")) { + if (files_to_delete[i] == String(ProjectSettings::get_singleton()->get("rendering/environment/default_environment"))) { ProjectSettings::get_singleton()->set("rendering/environment/default_environment", ""); } - if (files_to_delete[i] == ProjectSettings::get_singleton()->get("display/mouse_cursor/custom_image")) { + if (files_to_delete[i] == String(ProjectSettings::get_singleton()->get("display/mouse_cursor/custom_image"))) { ProjectSettings::get_singleton()->set("display/mouse_cursor/custom_image", ""); } - if (files_to_delete[i] == ProjectSettings::get_singleton()->get("gui/theme/custom")) { + if (files_to_delete[i] == String(ProjectSettings::get_singleton()->get("gui/theme/custom"))) { ProjectSettings::get_singleton()->set("gui/theme/custom", ""); } - if (files_to_delete[i] == ProjectSettings::get_singleton()->get("gui/theme/custom_font")) { + if (files_to_delete[i] == String(ProjectSettings::get_singleton()->get("gui/theme/custom_font"))) { ProjectSettings::get_singleton()->set("gui/theme/custom_font", ""); } - if (files_to_delete[i] == ProjectSettings::get_singleton()->get("audio/default_bus_layout")) { + if (files_to_delete[i] == String(ProjectSettings::get_singleton()->get("audio/default_bus_layout"))) { ProjectSettings::get_singleton()->set("audio/default_bus_layout", ""); } |