diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/dependency_editor.cpp | 16 | ||||
| -rw-r--r-- | editor/plugins/node_3d_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/texture_region_editor_plugin.cpp | 3 |
4 files changed, 12 insertions, 11 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", ""); } diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 7002ffa109..1abbd95af8 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -4687,7 +4687,7 @@ void Node3DEditor::set_state(const Dictionary &p_state) { } int state = EditorNode3DGizmoPlugin::VISIBLE; for (int i = 0; i < keys.size(); i++) { - if (gizmo_plugins_by_name.write[j]->get_name() == keys[i]) { + if (gizmo_plugins_by_name.write[j]->get_name() == String(keys[i])) { state = gizmos_status[keys[i]]; break; } diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index be8ddf789b..ea1941c931 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -2397,7 +2397,7 @@ void ScriptEditor::_editor_settings_changed() { if (current_theme == "") { current_theme = EditorSettings::get_singleton()->get("text_editor/theme/color_theme"); - } else if (current_theme != EditorSettings::get_singleton()->get("text_editor/theme/color_theme")) { + } else if (current_theme != String(EditorSettings::get_singleton()->get("text_editor/theme/color_theme"))) { current_theme = EditorSettings::get_singleton()->get("text_editor/theme/color_theme"); EditorSettings::get_singleton()->load_text_editor_theme(); } diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index 6e722607f7..f599b94428 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -875,7 +875,8 @@ void TextureRegionEditor::_changed_callback(Object *p_changed, const char *p_pro if (!is_visible()) { return; } - if (p_prop == StringName("atlas") || p_prop == StringName("texture") || p_prop == StringName("region")) { + String prop = p_prop; + if (prop == "atlas" || prop == "texture" || prop == "region") { _edit_region(); } } |