From b786e7877ba176c0cd5d8289abd8b60276dde35b Mon Sep 17 00:00:00 2001
From: damarindra <damarind@gmail.com>
Date: Sun, 24 Sep 2017 15:55:45 +0700
Subject: [PATCH] Fix: CollisionObject shape owner indexing is inconsistent

---
 scene/2d/collision_object_2d.cpp | 2 +-
 scene/3d/collision_object.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scene/2d/collision_object_2d.cpp b/scene/2d/collision_object_2d.cpp
index ce56b85a9eb2..73e5dc60215d 100644
--- a/scene/2d/collision_object_2d.cpp
+++ b/scene/2d/collision_object_2d.cpp
@@ -82,7 +82,7 @@ uint32_t CollisionObject2D::create_shape_owner(Object *p_owner) {
 	uint32_t id;
 
 	if (shapes.size() == 0) {
-		id = 1;
+		id = 0;
 	} else {
 		id = shapes.back()->key() + 1;
 	}
diff --git a/scene/3d/collision_object.cpp b/scene/3d/collision_object.cpp
index 1c0633fba74c..7b4770e43598 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;
 	}