diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-08 14:35:44 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-05-08 14:35:44 +0200 |
| commit | a9a1d0a162ef6be57374519589c538205e65a7fc (patch) | |
| tree | 1789441c8af84b396ca21892c332c0583abb9c48 /editor/import | |
| parent | 1d101329c96460a8b00a8dec5ff8808a589ee505 (diff) | |
| parent | a0dbdcc3abbd3e6307c6e68d0e60f8c0fa31d576 (diff) | |
| download | redot-engine-a9a1d0a162ef6be57374519589c538205e65a7fc.tar.gz | |
Merge pull request #91619 from AThousandShips/find_improve
Replace `find` with `contains/has` where applicable
Diffstat (limited to 'editor/import')
| -rw-r--r-- | editor/import/3d/resource_importer_obj.cpp | 2 | ||||
| -rw-r--r-- | editor/import/3d/resource_importer_scene.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/editor/import/3d/resource_importer_obj.cpp b/editor/import/3d/resource_importer_obj.cpp index f5bf60175a..6d68e93c75 100644 --- a/editor/import/3d/resource_importer_obj.cpp +++ b/editor/import/3d/resource_importer_obj.cpp @@ -217,7 +217,7 @@ static Error _parse_obj(const String &p_path, List<Ref<ImporterMesh>> &r_meshes, 0x14c, // IMAGE_FILE_MACHINE_I386 0x200, // IMAGE_FILE_MACHINE_IA64 }; - ERR_FAIL_COND_V_MSG(coff_header_machines.find(first_bytes) != -1, ERR_FILE_CORRUPT, vformat("Couldn't read OBJ file '%s', it seems to be binary, corrupted, or empty.", p_path)); + ERR_FAIL_COND_V_MSG(coff_header_machines.has(first_bytes), ERR_FILE_CORRUPT, vformat("Couldn't read OBJ file '%s', it seems to be binary, corrupted, or empty.", p_path)); f->seek(0); Ref<ImporterMesh> mesh; diff --git a/editor/import/3d/resource_importer_scene.cpp b/editor/import/3d/resource_importer_scene.cpp index 16ac80f7e1..36cbf253cc 100644 --- a/editor/import/3d/resource_importer_scene.cpp +++ b/editor/import/3d/resource_importer_scene.cpp @@ -2086,12 +2086,12 @@ bool ResourceImporterScene::get_internal_option_visibility(InternalImportCategor p_options.has("generate/physics") && p_options["generate/physics"].operator bool(); - if (p_option.find("physics/") >= 0) { + if (p_option.contains("physics/")) { // Show if need to generate collisions. return generate_physics; } - if (p_option.find("decomposition/") >= 0) { + if (p_option.contains("decomposition/")) { // Show if need to generate collisions. if (generate_physics && // Show if convex is enabled. @@ -2285,8 +2285,8 @@ bool ResourceImporterScene::get_internal_option_update_view_required(InternalImp if ( p_option == "generate/physics" || p_option == "physics/shape_type" || - p_option.find("decomposition/") >= 0 || - p_option.find("primitive/") >= 0) { + p_option.contains("decomposition/") || + p_option.contains("primitive/")) { return true; } } break; |