Merge pull request #76546 from KoBeWi/prevent_shape_editor_from_killi…

…ng_Godot Fix CollisionShape2D editor crash
godotengine · Apr 28, 2023 · e8f5d0f · e8f5d0f
2 parents 012e2b7 + e5d0bb1
commit e8f5d0f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git 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
@@ -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 @@ class CollisionShape2DEditor : public Control {
 	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 {