From 3eba84e1d778cc15459ee44449050d668e85ca79 Mon Sep 17 00:00:00 2001
From: Fabio Alessandrelli <fabio.alessandrelli@gmail.com>
Date: Mon, 30 Nov 2015 21:04:24 +0100
Subject: Properly update node after clearing shapes in
 _update_shapes_from_children() (fix bug causing eg. CircleShape2D.set_radius
 to generate multiple shapes)

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

diff --git a/scene/2d/collision_object_2d.cpp b/scene/2d/collision_object_2d.cpp
index 8b8caf13d3..809d2a95fa 100644
--- a/scene/2d/collision_object_2d.cpp
+++ b/scene/2d/collision_object_2d.cpp
@@ -32,14 +32,14 @@
 
 void CollisionObject2D::_update_shapes_from_children() {
 
-	shapes.resize(0);
+	shapes.clear();
 	for(int i=0;i<get_child_count();i++) {
 
 		Node* n = get_child(i);
 		n->call("_add_to_collision_object",this);
 	}
 
-//	_update_shapes();
+	_update_shapes();
 }
 
 void CollisionObject2D::_notification(int p_what) {
diff --git a/scene/3d/collision_object.cpp b/scene/3d/collision_object.cpp
index 5ecadb48b8..5a89423e5a 100644
--- a/scene/3d/collision_object.cpp
+++ b/scene/3d/collision_object.cpp
@@ -31,14 +31,14 @@
 #include "scene/scene_string_names.h"
 void CollisionObject::_update_shapes_from_children() {
 
-	shapes.resize(0);
+	shapes.clear();
 	for(int i=0;i<get_child_count();i++) {
 
 		Node* n = get_child(i);
 		n->call("_add_to_collision_object",this);
 	}
 
-//	_update_shapes();
+	_update_shapes();
 }
 
 void CollisionObject::_notification(int p_what) {
-- 
cgit v1.2.3