diff options
| author | David Luevano Alvarado <david@luevano.xyz> | 2024-03-05 06:06:14 -0600 |
|---|---|---|
| committer | David Luevano Alvarado <david@luevano.xyz> | 2024-03-05 06:08:35 -0600 |
| commit | a918c7c5fef98985b0d0ee1cac4e186242db6e9c (patch) | |
| tree | 82fac399bc078f4b0449d0ebabd2ca19dae5ff0e | |
| parent | a07dd0d6a520723c4838fb4b65461a16b7a50f90 (diff) | |
| download | redot-engine-a918c7c5fef98985b0d0ee1cac4e186242db6e9c.tar.gz | |
Match #89126 for 3D: check `Resource` type instead of extension
| -rw-r--r-- | editor/plugins/node_3d_editor_plugin.cpp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index aa0069979c..0d345a196b 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -4481,23 +4481,14 @@ bool Node3DEditorViewport::can_drop_data_fw(const Point2 &p_point, const Variant if (d.has("type") && (String(d["type"]) == "files")) { Vector<String> files = d["files"]; - List<String> scene_extensions; - ResourceLoader::get_recognized_extensions_for_type("PackedScene", &scene_extensions); - List<String> mesh_extensions; - ResourceLoader::get_recognized_extensions_for_type("Mesh", &mesh_extensions); - List<String> material_extensions; - ResourceLoader::get_recognized_extensions_for_type("Material", &material_extensions); - List<String> texture_extensions; - ResourceLoader::get_recognized_extensions_for_type("Texture", &texture_extensions); - + // Check if at least one of the dragged files is a mesh, material, texture or scene. for (int i = 0; i < files.size(); i++) { - String extension = files[i].get_extension().to_lower(); + bool is_scene = ClassDB::is_parent_class(ResourceLoader::get_resource_type(files[i]), "PackedScene"); + bool is_mesh = ClassDB::is_parent_class(ResourceLoader::get_resource_type(files[i]), "Mesh"); + bool is_material = ClassDB::is_parent_class(ResourceLoader::get_resource_type(files[i]), "Material"); + bool is_texture = ClassDB::is_parent_class(ResourceLoader::get_resource_type(files[i]), "Texture"); - // Check if dragged files with mesh or scene extension can be created at least once. - if (mesh_extensions.find(extension) || - scene_extensions.find(extension) || - material_extensions.find(extension) || - texture_extensions.find(extension)) { + if (is_mesh || is_scene || is_material || is_texture) { Ref<Resource> res = ResourceLoader::load(files[i]); if (res.is_null()) { continue; |