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

Merge pull request #90559 from Rindbee/fix-crash-when-drag-scene-file-to-screen

Browse Source 
Fix crash when dragging scene files to 2D/3D screen
This commit is contained in:
Rémi Verschelde 2024-04-12 11:17:05 +02:00
commit 30e71782af
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -5944,7 +5944,7 @@ bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Varian
} }
Node *edited_scene = EditorNode::get_singleton()->get_edited_scene(); Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
if (_cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) { if (edited_scene && !edited_scene->get_scene_file_path().is_empty() && _cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) {
memdelete(instantiated_scene); memdelete(instantiated_scene);
can_instantiate = false; can_instantiate = false;
is_cyclical_dep = true; is_cyclical_dep = true;

2
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -4507,7 +4507,7 @@ bool Node3DEditorViewport::can_drop_data_fw(const Point2 &p_point, const Variant
continue; continue;
} }
Node *edited_scene = EditorNode::get_singleton()->get_edited_scene(); Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
if (_cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) { if (edited_scene && !edited_scene->get_scene_file_path().is_empty() && _cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) {
memdelete(instantiated_scene); memdelete(instantiated_scene);
can_instantiate = false; can_instantiate = false;
is_cyclical_dep = true; is_cyclical_dep = true;