From 53f87077136ea59acb827116e4eb2ad3f9212569 Mon Sep 17 00:00:00 2001 From: Relintai Date: Wed, 27 Jul 2022 20:01:38 +0200 Subject: [PATCH] Ported: Add node list param to GraphEdit::delete_nodes_request signal - Chaosus https://github.com/godotengine/godot/commit/32b9818965e3ee32db7ef43e9e362b0a6e0c2aff --- doc/classes/GraphEdit.xml | 3 ++- .../animation_blend_tree_editor_plugin.cpp | 22 +++++++++---------- .../animation_blend_tree_editor_plugin.h | 2 +- scene/gui/graph_edit.cpp | 15 +++++++++++-- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/doc/classes/GraphEdit.xml b/doc/classes/GraphEdit.xml index 2ba74b3f7..1140fbe39 100644 --- a/doc/classes/GraphEdit.xml +++ b/doc/classes/GraphEdit.xml @@ -208,8 +208,9 @@ + - Emitted when a GraphNode is attempted to be removed from the GraphEdit. + Emitted when a GraphNode is attempted to be removed from the GraphEdit. Provides a list of node names to be removed (all selected nodes, excluding nodes without closing button). diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp index d713ea8ca..5b8ab4829 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.cpp +++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp @@ -30,19 +30,12 @@ #include "animation_blend_tree_editor_plugin.h" -#include "core/io/resource_loader.h" -#include "editor/editor_inspector.h" -#include "editor/editor_scale.h" -#include "scene/3d/skeleton.h" -#include "scene/animation/animation_player.h" -#include "scene/gui/graph_node.h" -#include "scene/gui/menu_button.h" -#include "scene/gui/progress_bar.h" #include "core/array.h" #include "core/class_db.h" #include "core/color.h" #include "core/error_macros.h" #include "core/hash_map.h" +#include "core/io/resource_loader.h" #include "core/list.h" #include "core/node_path.h" #include "core/os/memory.h" @@ -50,25 +43,32 @@ #include "core/typedefs.h" #include "core/undo_redo.h" #include "editor/editor_file_dialog.h" +#include "editor/editor_inspector.h" #include "editor/editor_node.h" +#include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "scene/2d/canvas_item.h" +#include "scene/3d/skeleton.h" +#include "scene/animation/animation_blend_tree.h" +#include "scene/animation/animation_player.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/check_box.h" #include "scene/gui/control.h" #include "scene/gui/dialogs.h" #include "scene/gui/graph_edit.h" +#include "scene/gui/graph_node.h" #include "scene/gui/label.h" #include "scene/gui/line_edit.h" +#include "scene/gui/menu_button.h" #include "scene/gui/panel_container.h" #include "scene/gui/popup_menu.h" +#include "scene/gui/progress_bar.h" #include "scene/gui/separator.h" #include "scene/gui/tree.h" #include "scene/main/node.h" #include "scene/resources/animation.h" #include "scene/resources/style_box.h" -#include "scene/animation/animation_blend_tree.h" void AnimationNodeBlendTreeEditor::add_custom_type(const String &p_name, const Ref