diff options
| author | Nathan Franke <natfra@pm.me> | 2021-12-09 03:42:46 -0600 |
|---|---|---|
| committer | Nathan Franke <natfra@pm.me> | 2021-12-09 04:48:38 -0600 |
| commit | 49403cbfa0399bb4284ea5c36cc90216a0bda6ff (patch) | |
| tree | caa6c7249d35d83b288a180a4f5d7e4fd959704f /editor/import/scene_import_settings.cpp | |
| parent | 31ded7e126b9d71ed8dddab9ffc1ce813f1a8ec2 (diff) | |
| download | redot-engine-49403cbfa0399bb4284ea5c36cc90216a0bda6ff.tar.gz | |
Replace String comparisons with "", String() to is_empty()
Also:
- Adds two stress tests to test_string.h
- Changes to .empty() on std::strings
Diffstat (limited to 'editor/import/scene_import_settings.cpp')
| -rw-r--r-- | editor/import/scene_import_settings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/import/scene_import_settings.cpp b/editor/import/scene_import_settings.cpp index 5690d49a55..a376596f9b 100644 --- a/editor/import/scene_import_settings.cpp +++ b/editor/import/scene_import_settings.cpp @@ -92,7 +92,7 @@ void SceneImportSettings::_fill_material(Tree *p_tree, const Ref<Material> &p_ma if (p_material->has_meta("import_id")) { import_id = p_material->get_meta("import_id"); has_import_id = true; - } else if (p_material->get_name() != "") { + } else if (!p_material->get_name().is_empty()) { import_id = p_material->get_name(); has_import_id = true; } else { @@ -148,7 +148,7 @@ void SceneImportSettings::_fill_mesh(Tree *p_tree, const Ref<Mesh> &p_mesh, Tree if (p_mesh->has_meta("import_id")) { import_id = p_mesh->get_meta("import_id"); has_import_id = true; - } else if (p_mesh->get_name() != String()) { + } else if (!p_mesh->get_name().is_empty()) { import_id = p_mesh->get_name(); has_import_id = true; } else { @@ -414,7 +414,7 @@ void SceneImportSettings::_update_camera() { float rot_y = cam_rot_y; float zoom = cam_zoom; - if (selected_type == "Node" || selected_type == "") { + if (selected_type == "Node" || selected_type.is_empty()) { camera_aabb = contents_aabb; } else { if (mesh_preview->get_mesh().is_valid()) { |