godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-21 14:57:09 +00:00
Code Releases Wiki Activity

Fix skeleton 3d editor's toolbar ui deleted from wrong container

Browse Source
This commit is contained in:
jsjtxietian
2023-09-23 00:46:59 +08:00
parent fe5b1c8d49
commit 2679118d51
2 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
editor/plugins/skeleton_3d_editor_plugin.cpp
View File

@@ -712,7 +712,7 @@ void Skeleton3DEditor::create_editors() {
add_child(file_dialog); add_child(file_dialog);
// Create Top Menu Bar. // Create Top Menu Bar.
HBoxContainer *topmenu_bar = memnew(HBoxContainer); topmenu_bar = memnew(HBoxContainer);
ne->add_control_to_menu_panel(topmenu_bar); ne->add_control_to_menu_panel(topmenu_bar);
// Create Skeleton Option in Top Menu Bar. // Create Skeleton Option in Top Menu Bar.
@@ -1095,25 +1095,8 @@ Skeleton3DEditor::~Skeleton3DEditor() {
Node3DEditor *ne = Node3DEditor::get_singleton(); Node3DEditor *ne = Node3DEditor::get_singleton();
if (animation_hb) { ne->remove_control_from_menu_panel(topmenu_bar);
ne->remove_control_from_menu_panel(animation_hb); memdelete(topmenu_bar);
memdelete(animation_hb);
}
if (separator) {
ne->remove_control_from_menu_panel(separator);
memdelete(separator);
}
if (skeleton_options) {
ne->remove_control_from_menu_panel(skeleton_options);
memdelete(skeleton_options);
}
if (edit_mode_button) {
ne->remove_control_from_menu_panel(edit_mode_button);
memdelete(edit_mode_button);
}
} }
bool EditorInspectorPluginSkeleton::can_handle(Object *p_object) { bool EditorInspectorPluginSkeleton::can_handle(Object *p_object) {

2
editor/plugins/skeleton_3d_editor_plugin.h
View File

@@ -120,7 +120,7 @@ class Skeleton3DEditor : public VBoxContainer {
BoneTransformEditor *rest_editor = nullptr; BoneTransformEditor *rest_editor = nullptr;
BoneTransformEditor *pose_editor = nullptr; BoneTransformEditor *pose_editor = nullptr;
VSeparator *separator = nullptr; HBoxContainer *topmenu_bar = nullptr;
MenuButton *skeleton_options = nullptr; MenuButton *skeleton_options = nullptr;
Button *edit_mode_button = nullptr; Button *edit_mode_button = nullptr;