Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2025-01-12 15:01:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few in-editor crashes.

Browse Source
This commit is contained in:
Relintai 2020-04-20 13:54:24 +02:00
parent 5748179d66
commit 70c884d273
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
world/default/voxel_chunk_default.cpp
View File

@ -596,8 +596,12 @@ void VoxelChunkDefault::create_colliders(const int mesh_index, const int layer_m
PhysicsServer::get_singleton()->body_set_state(body_rid, PhysicsServer::BODY_STATE_TRANSFORM, get_transform()); PhysicsServer::get_singleton()->body_set_state(body_rid, PhysicsServer::BODY_STATE_TRANSFORM, get_transform());
if (get_voxel_world()->is_inside_world()) if (get_voxel_world()->is_inside_world()) {
PhysicsServer::get_singleton()->body_set_space(body_rid, get_voxel_world()->get_world()->get_space()); Ref<World> world = get_voxel_world()->get_world();
if (world.is_valid() && world->get_space() != RID())
PhysicsServer::get_singleton()->body_set_space(body_rid, world->get_space());
}
m[MESH_TYPE_INDEX_BODY] = body_rid; m[MESH_TYPE_INDEX_BODY] = body_rid;
m[MESH_TYPE_INDEX_SHAPE] = shape_rid; m[MESH_TYPE_INDEX_SHAPE] = shape_rid;
@ -623,8 +627,12 @@ void VoxelChunkDefault::create_colliders_area(const int mesh_index, const int la
PhysicsServer::get_singleton()->area_add_shape(area_rid, shape_rid, get_transform()); PhysicsServer::get_singleton()->area_add_shape(area_rid, shape_rid, get_transform());
if (get_voxel_world()->is_inside_world()) if (get_voxel_world()->is_inside_world()) {
PhysicsServer::get_singleton()->area_set_space(area_rid, get_voxel_world()->get_world()->get_space()); Ref<World> world = get_voxel_world()->get_world();
if (world.is_valid() && world->get_space() != RID())
PhysicsServer::get_singleton()->area_set_space(area_rid, world->get_space());
}
m[MESH_TYPE_INDEX_AREA] = area_rid; m[MESH_TYPE_INDEX_AREA] = area_rid;
m[MESH_TYPE_INDEX_SHAPE] = shape_rid; m[MESH_TYPE_INDEX_SHAPE] = shape_rid;