asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash on doc dragging in script list panel

Browse source 
(cherry picked from commit c86aa2a705)
This commit is contained in:
Yuri Roubinsky 2021-07-31 21:42:29 +03:00 committed by Rémi Verschelde
parent e0f8efcb01
commit 37c985e189
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
editor/editor_resource_picker.cpp
View file

@ -505,7 +505,9 @@ bool EditorResourcePicker::_is_drop_valid(const Dictionary &p_drag_data) const {
Ref<Resource> res; Ref<Resource> res;
if (drag_data.has("type") && String(drag_data["type"]) == "script_list_element") { if (drag_data.has("type") && String(drag_data["type"]) == "script_list_element") {
ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(drag_data["script_list_element"]); ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(drag_data["script_list_element"]);
res = se->get_edited_resource(); if (se) {
res = se->get_edited_resource();
}
} else if (drag_data.has("type") && String(drag_data["type"]) == "resource") { } else if (drag_data.has("type") && String(drag_data["type"]) == "resource") {
res = drag_data["resource"]; res = drag_data["resource"];
} }
@ -572,7 +574,9 @@ void EditorResourcePicker::drop_data_fw(const Point2 &p_point, const Variant &p_
Ref<Resource> dropped_resource; Ref<Resource> dropped_resource;
if (drag_data.has("type") && String(drag_data["type"]) == "script_list_element") { if (drag_data.has("type") && String(drag_data["type"]) == "script_list_element") {
ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(drag_data["script_list_element"]); ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(drag_data["script_list_element"]);
dropped_resource = se->get_edited_resource(); if (se) {
dropped_resource = se->get_edited_resource();
}
} else if (drag_data.has("type") && String(drag_data["type"]) == "resource") { } else if (drag_data.has("type") && String(drag_data["type"]) == "resource") {
dropped_resource = drag_data["resource"]; dropped_resource = drag_data["resource"];
} }