diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2015-11-30 21:04:24 +0100 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2015-12-02 11:30:48 +0100 |
| commit | 3eba84e1d778cc15459ee44449050d668e85ca79 (patch) | |
| tree | b9d6ef2438840de6afb96fee32a02d2897cd5695 | |
| parent | f1f3468f70c85c33f630042670b47401eeee6092 (diff) | |
Properly update node after clearing shapes in _update_shapes_from_children()
(fix bug causing eg. CircleShape2D.set_radius to generate multiple shapes)
| -rw-r--r-- | scene/2d/collision_object_2d.cpp | 4 | ||||
| -rw-r--r-- | 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) { |