Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Match #89126 for 3D: check for Resource type instead of extension #89177

Merged
merged 1 commit into from
Mar 5, 2024
Merged

Match #89126 for 3D: check for Resource type instead of extension #89177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions editor/plugins/node_3d_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading