summaryrefslogtreecommitdiff
path: root/scene/3d/collision_object.cpp
diff options
context:
space:
mode:
authorPoommetee Ketson <poommetee@protonmail.com>2017-09-24 17:17:46 +0700
committerGitHub <noreply@github.com>2017-09-24 17:17:46 +0700
commit071088cb1439a17adf9f15cb34861da005436cac (patch)
tree46fa0a8144be38a670ca9e05e44975c033e2bd29 /scene/3d/collision_object.cpp
parent622d428baa980449a960a2eb03d833fbfb02533d (diff)
parentb786e7877ba176c0cd5d8289abd8b60276dde35b (diff)
Merge pull request #11535 from damarindra/master
Fix: CollisionObject shape owner indexing is inconsistent
Diffstat (limited to 'scene/3d/collision_object.cpp')
-rw-r--r--scene/3d/collision_object.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/3d/collision_object.cpp b/scene/3d/collision_object.cpp
index 1c0633fba7..7b4770e435 100644
--- a/scene/3d/collision_object.cpp
+++ b/scene/3d/collision_object.cpp
@@ -161,7 +161,7 @@ uint32_t CollisionObject::create_shape_owner(Object *p_owner) {
uint32_t id;
if (shapes.size() == 0) {
- id = 1;
+ id = 0;
} else {
id = shapes.back()->key() + 1;
}