Skip to content

Commit 4ff5326

Browse files
committed
Fix crash when dragging scene files to 2D/3D screen
The crash usually occurs when there is no scene root node.
1 parent b2f425f commit 4ff5326

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

editor/plugins/canvas_item_editor_plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5944,7 +5944,7 @@ bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Varian
59445944
}
59455945

59465946
Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
5947-
if (_cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) {
5947+
if (edited_scene && !edited_scene->get_scene_file_path().is_empty() && _cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) {
59485948
memdelete(instantiated_scene);
59495949
can_instantiate = false;
59505950
is_cyclical_dep = true;

editor/plugins/node_3d_editor_plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4507,7 +4507,7 @@ bool Node3DEditorViewport::can_drop_data_fw(const Point2 &p_point, const Variant
45074507
continue;
45084508
}
45094509
Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
4510-
if (_cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) {
4510+
if (edited_scene && !edited_scene->get_scene_file_path().is_empty() && _cyclical_dependency_exists(edited_scene->get_scene_file_path(), instantiated_scene)) {
45114511
memdelete(instantiated_scene);
45124512
can_instantiate = false;
45134513
is_cyclical_dep = true;

0 commit comments

Comments
 (0)