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

Merge pull request #11535 from damarindra/master

Browse source 
Fix: CollisionObject shape owner indexing is inconsistent
This commit is contained in:
Poommetee Ketson 2017-09-24 17:17:46 +07:00 committed by GitHub
commit 071088cb14
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene/2d/collision_object_2d.cpp
View file

@ -82,7 +82,7 @@ uint32_t CollisionObject2D::create_shape_owner(Object *p_owner) {
uint32_t id; uint32_t id;
if (shapes.size() == 0) { if (shapes.size() == 0) {
id = 1; id = 0;
} else { } else {
id = shapes.back()->key() + 1; id = shapes.back()->key() + 1;
} }

2
scene/3d/collision_object.cpp
View file

@ -161,7 +161,7 @@ uint32_t CollisionObject::create_shape_owner(Object *p_owner) {
uint32_t id; uint32_t id;
if (shapes.size() == 0) { if (shapes.size() == 0) {
id = 1; id = 0;
} else { } else {
id = shapes.back()->key() + 1; id = shapes.back()->key() + 1;
} }