godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #76546 from KoBeWi/prevent_shape_editor_from_killing_Godot 

Fix CollisionShape2D editor crash
This commit is contained in:
Rémi Verschelde 2023-04-28 17:08:33 +02:00
parent 012e2b7411 e5d0bb1605
commit e8f5d0f6e8
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editor/plugins/collision_shape_2d_editor_plugin.cpp
View File

@ -552,16 +552,6 @@ void CollisionShape2DEditor::edit(Node *p_node) {
_shape_changed();
}
CollisionShape2DEditor::CollisionShape2DEditor() {
node = nullptr;
canvas_item_editor = nullptr;
edit_handle = -1;
pressed = false;
shape_type = 0;
}
void CollisionShape2DEditorPlugin::edit(Object *p_obj) {
collision_shape_2d_editor->edit(Object::cast_to<Node>(p_obj));
}

8
editor/plugins/collision_shape_2d_editor_plugin.h
View File

@ -66,9 +66,9 @@ class CollisionShape2DEditor : public Control {
Vector<Point2> handles;
int shape_type;
int edit_handle;
bool pressed;
int shape_type = -1;
int edit_handle = -1;
bool pressed = false;
Variant original;
Transform2D original_transform;
Vector2 original_point;
@ -90,8 +90,6 @@ public:
bool forward_canvas_gui_input(const Ref<InputEvent> &p_event);
void forward_canvas_draw_over_viewport(Control *p_overlay);
void edit(Node *p_node);
CollisionShape2DEditor();
};
class CollisionShape2DEditorPlugin : public EditorPlugin {