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

Merge pull request #89126 from luevano/fix-89093-followup

Browse Source 
Fix editor crash when unsupported `Resource` is dropped in scene
This commit is contained in:
Rémi Verschelde 2024-03-04 20:43:49 +01:00
commit c4a46e00f8
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 45 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -5901,62 +5901,59 @@ void CanvasItemEditorViewport::_perform_drop_data() {
bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Variant &p_data) const { bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Variant &p_data) const {
Dictionary d = p_data; Dictionary d = p_data;
if (d.has("type")) { if (!d.has("type") || (String(d["type"]) != "files")) {
if (String(d["type"]) == "files") { label->hide();
Vector<String> files = d["files"]; return false;
bool can_instantiate = false; }
List<String> scene_extensions; Vector<String> files = d["files"];
ResourceLoader::get_recognized_extensions_for_type("PackedScene", &scene_extensions); bool can_instantiate = false;
List<String> texture_extensions;
ResourceLoader::get_recognized_extensions_for_type("Texture2D", &texture_extensions);
for (int i = 0; i < files.size(); i++) { // Check if at least one of the dragged files is a texture or scene.
String extension = files[i].get_extension().to_lower(); for (int i = 0; i < files.size(); i++) {
bool is_scene = ClassDB::is_parent_class(ResourceLoader::get_resource_type(files[i]), "PackedScene");
bool is_texture = ClassDB::is_parent_class(ResourceLoader::get_resource_type(files[i]), "Texture2D");
// Check if dragged files with texture or scene extension can be created at least once. if (is_scene || is_texture) {
if (texture_extensions.find(extension) || scene_extensions.find(extension)) { Ref<Resource> res = ResourceLoader::load(files[i]);
Ref<Resource> res = ResourceLoader::load(files[i]); if (res.is_null()) {
if (res.is_null()) { continue;
continue;
}
Ref<PackedScene> scn = res;
if (scn.is_valid()) {
Node *instantiated_scene = scn->instantiate(PackedScene::GEN_EDIT_STATE_INSTANCE);
if (!instantiated_scene) {
continue;
}
memdelete(instantiated_scene);
}
can_instantiate = true;
break;
}
} }
if (can_instantiate) { Ref<PackedScene> scn = res;
if (!preview_node->get_parent()) { // create preview only once if (scn.is_valid()) {
_create_preview(files); Node *instantiated_scene = scn->instantiate(PackedScene::GEN_EDIT_STATE_INSTANCE);
if (!instantiated_scene) {
continue;
} }
Transform2D trans = canvas_item_editor->get_canvas_transform(); memdelete(instantiated_scene);
preview_node->set_position((p_point - trans.get_origin()) / trans.get_scale().x);
String scene_file_path = preview_node->get_child(0)->get_scene_file_path();
if (scene_file_path.is_empty() || preview_node->get_tree()->get_edited_scene_root()) {
double snap = EDITOR_GET("interface/inspector/default_float_step");
int snap_step_decimals = Math::range_step_decimals(snap);
#define FORMAT(value) (TS->format_number(String::num(value, snap_step_decimals)))
Vector2 preview_node_pos = preview_node->get_global_position();
canvas_item_editor->message = TTR("Instantiating:") + " (" + FORMAT(preview_node_pos.x) + ", " + FORMAT(preview_node_pos.y) + ") px";
label->set_text(vformat(TTR("Adding %s..."), default_texture_node_type));
} else {
canvas_item_editor->message = TTR("Creating inherited scene from: ") + scene_file_path;
}
canvas_item_editor->update_viewport();
} }
return can_instantiate; can_instantiate = true;
break;
} }
} }
label->hide(); if (can_instantiate) {
return false; if (!preview_node->get_parent()) { // create preview only once
_create_preview(files);
}
ERR_FAIL_COND_V(preview_node->get_child_count() == 0, false);
Transform2D trans = canvas_item_editor->get_canvas_transform();
preview_node->set_position((p_point - trans.get_origin()) / trans.get_scale().x);
String scene_file_path = preview_node->get_child(0)->get_scene_file_path();
if (scene_file_path.is_empty() || preview_node->get_tree()->get_edited_scene_root()) {
double snap = EDITOR_GET("interface/inspector/default_float_step");
int snap_step_decimals = Math::range_step_decimals(snap);
#define FORMAT(value) (TS->format_number(String::num(value, snap_step_decimals)))
Vector2 preview_node_pos = preview_node->get_global_position();
canvas_item_editor->message = TTR("Instantiating:") + " (" + FORMAT(preview_node_pos.x) + ", " + FORMAT(preview_node_pos.y) + ") px";
label->set_text(vformat(TTR("Adding %s..."), default_texture_node_type));
} else {
canvas_item_editor->message = TTR("Creating inherited scene from: ") + scene_file_path;
}
canvas_item_editor->update_viewport();
}
return can_instantiate;
} }
void CanvasItemEditorViewport::_show_resource_type_selector() { void CanvasItemEditorViewport::_show_resource_type_selector() {