godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89177 from luevano/match-89126-3D 

Match #89126 for 3D: check for `Resource` type instead of extension
This commit is contained in:
Rémi Verschelde 2024-03-05 14:55:32 +01:00
parent 93bc77567a a918c7c5fe
commit c3daa041e0
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -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;