summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkobewi <kobewi4e@gmail.com>2023-04-28 16:25:38 +0200
committerRĂ©mi Verschelde <rverschelde@gmail.com>2023-04-28 17:16:53 +0200
commitfdf66b3472e5ca254a4f90c32f26c4702d46828b (patch)
treea5c313bba20b00627edacc0d7900ec6ad1fca2a4
parent2d74ee0e5b89e233ef5e86c0667f09a48e963f82 (diff)
Fix CollisionShape2D editor crash
(cherry picked from commit e5d0bb1605e93041c7329374cccdf8290e1574e2)
-rw-r--r--editor/plugins/collision_shape_2d_editor_plugin.cpp10
-rw-r--r--editor/plugins/collision_shape_2d_editor_plugin.h8
2 files changed, 3 insertions, 15 deletions
diff --git a/editor/plugins/collision_shape_2d_editor_plugin.cpp b/editor/plugins/collision_shape_2d_editor_plugin.cpp
index 64a3346224..0aef364c2d 100644
--- a/editor/plugins/collision_shape_2d_editor_plugin.cpp
+++ b/editor/plugins/collision_shape_2d_editor_plugin.cpp
@@ -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));
}
diff --git a/editor/plugins/collision_shape_2d_editor_plugin.h b/editor/plugins/collision_shape_2d_editor_plugin.h
index 749245ae28..13a99ec6f3 100644
--- a/editor/plugins/collision_shape_2d_editor_plugin.h
+++ b/editor/plugins/collision_shape_2d_editor_plugin.h
@@ -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 {