diff options
| -rw-r--r-- | doc/classes/OS.xml | 2 | ||||
| -rw-r--r-- | editor/scene_tree_dock.cpp | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml index 2629e6740d..9fd4328402 100644 --- a/doc/classes/OS.xml +++ b/doc/classes/OS.xml @@ -376,7 +376,7 @@ <return type="String"> </return> <description> - Returns a unique string. + Returns a string that is unique to the device. Currently only works on Android and iOS. Returns empty string on other platforms. </description> </method> <method name="get_unix_time" qualifiers="const"> diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 7438c7671e..58f70ce11e 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -533,10 +533,6 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { if (p_confirm_override) { _delete_confirm(); - // hack, force 2d editor viewport to refresh after deletion - if (CanvasItemEditor *editor = CanvasItemEditor::get_singleton()) - editor->get_viewport_control()->update(); - } else { delete_dialog->set_text(TTR("Delete Node(s)?")); delete_dialog->popup_centered_minsize(); @@ -1345,6 +1341,12 @@ void SceneTreeDock::_delete_confirm() { } } editor_data->get_undo_redo().commit_action(); + + // hack, force 2d editor viewport to refresh after deletion + if (CanvasItemEditor *editor = CanvasItemEditor::get_singleton()) + editor->get_viewport_control()->update(); + + editor->push_item(NULL); } void SceneTreeDock::_selection_changed() { |