Skip to content

GH-1183 Fix engine freeze when Skeleton3DEditor is Deleted #1220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JoltedJon wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −0
Open

GH-1183 Fix engine freeze when Skeleton3DEditor is Deleted #1220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions editor/scene/3d/skeleton_3d_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,6 +918,9 @@ void Skeleton3DEditor::_joint_tree_button_clicked(Object *p_item, int p_column,
}

void Skeleton3DEditor::_update_properties() {
if (is_deleting) {
return;
}
if (pose_editor) {
pose_editor->_update_properties();
}
Expand Down Expand Up @@ -1166,6 +1169,7 @@ void Skeleton3DEditor::_notification(int p_what) {
update_joint_tree();
} break;
case NOTIFICATION_PREDELETE: {
is_deleting = true;
if (editor_plugin) {
editor_plugin->skeleton_editor = nullptr;
}
Expand Down
1 change: 1 addition & 0 deletions editor/scene/3d/skeleton_3d_editor_plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ class Skeleton3DEditor : public VBoxContainer {
Button *edit_mode_button = nullptr;

bool edit_mode = false;
bool is_deleting = false;

HBoxContainer *animation_hb = nullptr;
Button *key_loc_button = nullptr;
Expand Down
Loading