1 files changed, 24 insertions, 8 deletions

diff --git a/scene/3d/collision_shape.cpp b/scene/3d/collision_shape.cpp
index ac33e2b714..3190e1e0b2 100644
--- a/scene/3d/collision_shape.cpp
+++ b/scene/3d/collision_shape.cpp
@@ -65,7 +65,6 @@ void CollisionShape::make_convex_from_brothers() {
 }
 
 void CollisionShape::_update_in_shape_owner(bool p_xform_only) {
-
 	parent->shape_owner_set_transform(owner_id, get_transform());
 	if (p_xform_only)
 		return;
@@ -91,7 +90,7 @@ void CollisionShape::_notification(int p_what) {
 				_update_in_shape_owner();
 			}
 			if (get_tree()->is_debugging_collisions_hint()) {
-				_create_debug_shape();
+				_update_debug_shape();
 			}
 		} break;
 		case NOTIFICATION_LOCAL_TRANSFORM_CHANGED: {
@@ -142,17 +141,24 @@ void CollisionShape::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("make_convex_from_brothers"), &CollisionShape::make_convex_from_brothers);
 	ClassDB::set_method_flags("CollisionShape", "make_convex_from_brothers", METHOD_FLAGS_DEFAULT | METHOD_FLAG_EDITOR);
 
+	ClassDB::bind_method(D_METHOD("_shape_changed"), &CollisionShape::_shape_changed);
+	ClassDB::bind_method(D_METHOD("_update_debug_shape"), &CollisionShape::_update_debug_shape);
+
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shape", PROPERTY_HINT_RESOURCE_TYPE, "Shape"), "set_shape", "get_shape");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "disabled"), "set_disabled", "is_disabled");
 }
 
 void CollisionShape::set_shape(const Ref<Shape> &p_shape) {
 
-	if (!shape.is_null())
+	if (!shape.is_null()) {
 		shape->unregister_owner(this);
+		shape->disconnect("changed", this, "_shape_changed");
+	}
 	shape = p_shape;
-	if (!shape.is_null())
+	if (!shape.is_null()) {
 		shape->register_owner(this);
+		shape->connect("changed", this, "_shape_changed");
+	}
 	update_gizmo();
 	if (parent) {
 		parent->shape_owner_clear_shapes(owner_id);
@@ -161,6 +167,8 @@ void CollisionShape::set_shape(const Ref<Shape> &p_shape) {
 		}
 	}
 
+	if (is_inside_tree())
+		_shape_changed();
 	update_configuration_warning();
 }
 
@@ -199,7 +207,8 @@ CollisionShape::~CollisionShape() {
 	//VisualServer::get_singleton()->free(indicator);
 }
 
-void CollisionShape::_create_debug_shape() {
+void CollisionShape::_update_debug_shape() {
+	debug_shape_dirty = false;
 
 	if (debug_shape) {
 		debug_shape->queue_delete();
@@ -207,15 +216,22 @@ void CollisionShape::_create_debug_shape() {
 	}
 
 	Ref<Shape> s = get_shape();
-
 	if (s.is_null())
 		return;
 
 	Ref<Mesh> mesh = s->get_debug_mesh();
-
 	MeshInstance *mi = memnew(MeshInstance);
 	mi->set_mesh(mesh);
-
 	add_child(mi);
 	debug_shape = mi;
 }
+
+void CollisionShape::_shape_changed() {
+	// If this is a heightfield shape our center may have changed
+	_update_in_shape_owner(true);
+
+	if (is_inside_tree() && get_tree()->is_debugging_collisions_hint() && !debug_shape_dirty) {
+		debug_shape_dirty = true;
+		call_deferred("_update_debug_shape");
+	}
+}