asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix potential null pointer use, based on #54094 fix

Browse source
This commit is contained in:
Bastien JAUNY 2021-10-23 16:22:29 +02:00
parent 2a28df82d4
commit 258b5d0019
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/2d/collision_object_2d.cpp
View file

@ -50,7 +50,9 @@ void CollisionObject2D::_notification(int p_what) {
} }
if (!disabled || (disable_mode != DISABLE_MODE_REMOVE)) { if (!disabled || (disable_mode != DISABLE_MODE_REMOVE)) {
RID space = get_world_2d()->get_space(); Ref<World2D> world_ref = get_world_2d();
ERR_FAIL_COND(!world_ref.is_valid());
RID space = world_ref->get_space();
if (area) { if (area) {
PhysicsServer2D::get_singleton()->area_set_space(rid, space); PhysicsServer2D::get_singleton()->area_set_space(rid, space);
} else { } else {

4
scene/3d/collision_object_3d.cpp
View file

@ -64,7 +64,9 @@ void CollisionObject3D::_notification(int p_what) {
} }
if (!disabled || (disable_mode != DISABLE_MODE_REMOVE)) { if (!disabled || (disable_mode != DISABLE_MODE_REMOVE)) {
RID space = get_world_3d()->get_space(); Ref<World3D> world_ref = get_world_3d();
ERR_FAIL_COND(!world_ref.is_valid());
RID space = world_ref->get_space();
if (area) { if (area) {
PhysicsServer3D::get_singleton()->area_set_space(rid, space); PhysicsServer3D::get_singleton()->area_set_space(rid, space);
} else { } else {