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

Merge pull request #87125 from ryevdokimov/fix-removing-preview-nodes-on-ui-cancel 

Clear drag preview nodes on `NOTIFICATION_DRAG_END`
This commit is contained in:
Rémi Verschelde 2024-02-05 14:48:56 +01:00
parent acde2a81ff 7a2c386e28
commit e096be85c4
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -6030,6 +6030,10 @@ void CanvasItemEditorViewport::_notification(int p_what) {
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
disconnect("mouse_exited", callable_mp(this, &CanvasItemEditorViewport::_on_mouse_exit)); disconnect("mouse_exited", callable_mp(this, &CanvasItemEditorViewport::_on_mouse_exit));
} break; } break;
case NOTIFICATION_DRAG_END: {
_remove_preview();
} break;
} }
} }

2
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -3017,6 +3017,8 @@ void Node3DEditorViewport::_notification(int p_what) {
// Clear preview material when dropped outside applicable object. // Clear preview material when dropped outside applicable object.
if (spatial_editor->get_preview_material().is_valid() && !is_drag_successful()) { if (spatial_editor->get_preview_material().is_valid() && !is_drag_successful()) {
_remove_preview_material(); _remove_preview_material();
} else {
_remove_preview_node();
} }
} break; } break;
} }