Skip to content

Commit 3d91a48

Browse files
authored
Merge pull request #110805 from lawnjelly/fix_ancestry_construct
Fix ancestry constructors
2 parents 7521044 + cbbc2ea commit 3d91a48

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

scene/3d/physics/collision_object_3d.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,7 @@ CollisionObject3D::CollisionObject3D(RID p_rid, bool p_area) {
713713
rid = p_rid;
714714
area = p_area;
715715
set_notify_transform(true);
716+
_define_ancestry(AncestralClass::COLLISION_OBJECT_3D);
716717

717718
if (p_area) {
718719
PhysicsServer3D::get_singleton()->area_attach_object_instance_id(rid, get_instance_id());
@@ -755,8 +756,6 @@ CollisionObject3D::CollisionObject3D() {
755756
}
756757

757758
CollisionObject3D::~CollisionObject3D() {
758-
_define_ancestry(AncestralClass::COLLISION_OBJECT_3D);
759-
760759
ERR_FAIL_NULL(PhysicsServer3D::get_singleton());
761760
PhysicsServer3D::get_singleton()->free(rid);
762761
}

scene/3d/physics/physics_body_3d.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ void PhysicsBody3D::_bind_methods() {
5353

5454
PhysicsBody3D::PhysicsBody3D(PhysicsServer3D::BodyMode p_mode) :
5555
CollisionObject3D(PhysicsServer3D::get_singleton()->body_create(), false) {
56+
_define_ancestry(AncestralClass::PHYSICS_BODY_3D);
5657
set_body_mode(p_mode);
5758
}
5859

@@ -220,10 +221,6 @@ PackedStringArray PhysicsBody3D::get_configuration_warnings() const {
220221
return warnings;
221222
}
222223

223-
PhysicsBody3D::PhysicsBody3D() {
224-
_define_ancestry(AncestralClass::PHYSICS_BODY_3D);
225-
}
226-
227224
///////////////////////////////////////
228225

229226
//so, if you pass 45 as limit, avoid numerical precision errors when angle is 45.

scene/3d/physics/physics_body_3d.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,4 @@ class PhysicsBody3D : public CollisionObject3D {
6767
TypedArray<PhysicsBody3D> get_collision_exceptions();
6868
void add_collision_exception_with(Node *p_node); //must be physicsbody
6969
void remove_collision_exception_with(Node *p_node);
70-
71-
PhysicsBody3D();
7270
};

0 commit comments

Comments
 (0)