noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix Polygon2D editor undo crash

Browse Source
This commit is contained in:
kobewi
2025-10-31 11:40:51 +01:00
parent 250ef8dc32
commit 865a2b0ec5
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
editor/scene/2d/polygon_2d_editor_plugin.cpp
View File

@@ -69,7 +69,7 @@ void Polygon2DEditor::_set_node(Node *p_polygon) {
if (node) {
canvas->set_texture_filter(node->get_texture_filter_in_tree());
_update_bone_list();
_update_bone_list(node);
_update_available_modes();
if (current_mode == MODE_MAX) {
_select_mode(MODE_POINTS); // Initialize when opening the first time.
@@ -200,12 +200,17 @@ void Polygon2DEditor::_sync_bones() {
undo_redo->create_action(TTR("Sync Bones"));
undo_redo->add_do_method(node, "_set_bones", new_bones);
undo_redo->add_undo_method(node, "_set_bones", prev_bones);
undo_redo->add_do_method(this, "_update_bone_list");
undo_redo->add_undo_method(this, "_update_bone_list");
undo_redo->add_do_method(this, "_update_bone_list", node);
undo_redo->add_undo_method(this, "_update_bone_list", node);
undo_redo->commit_action();
}
void Polygon2DEditor::_update_bone_list() {
void Polygon2DEditor::_update_bone_list(const Polygon2D *p_for_node) {
ERR_FAIL_NULL(p_for_node);
if (p_for_node != node) {
return;
}
NodePath selected;
while (bone_scroll_vb->get_child_count()) {
CheckBox *cb = Object::cast_to<CheckBox>(bone_scroll_vb->get_child(0));
@@ -297,7 +302,7 @@ void Polygon2DEditor::_select_mode(int p_mode) {
bone_paint_strength->show();
bone_paint_radius->show();
bone_paint_radius_label->show();
_update_bone_list();
_update_bone_list(node);
bone_paint_pos = Vector2(-100000, -100000); // Send brush away when switching.
} break;
default:
@@ -1260,7 +1265,7 @@ void Polygon2DEditor::_canvas_draw() {
}
void Polygon2DEditor::_bind_methods() {
ClassDB::bind_method(D_METHOD("_update_bone_list"), &Polygon2DEditor::_update_bone_list);
ClassDB::bind_method(D_METHOD("_update_bone_list", "for_node"), &Polygon2DEditor::_update_bone_list);
ClassDB::bind_method(D_METHOD("_update_polygon_editing_state"), &Polygon2DEditor::_update_polygon_editing_state);
}

2
editor/scene/2d/polygon_2d_editor_plugin.h
View File

@@ -121,7 +121,7 @@ class Polygon2DEditor : public AbstractPolygon2DEditor {
AcceptDialog *grid_settings = nullptr;
void _sync_bones();
void _update_bone_list();
void _update_bone_list(const Polygon2D *p_for_node);
Vector<Vector2> editing_points;
Vector<Vector2> previous_uv;