diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-01-23 23:07:23 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-23 23:07:23 -0300 |
| commit | d01f55a78eb08e5645310f17caac0ae49647a013 (patch) | |
| tree | 3b1ac9f745908b3f9ab3aacc856882b07c3146fd /scene/3d/collision_object.cpp | |
| parent | a74138a0dc5862d2c26eb78a141ba3c3f9d01c6d (diff) | |
| parent | 1231c795dedbaaefae8c99f23f7547d320a4ffc9 (diff) | |
Merge pull request #2698 from Faless/add_area_fix
Fix bug in Body(2D)SW::add_area
Diffstat (limited to 'scene/3d/collision_object.cpp')
| -rw-r--r-- | scene/3d/collision_object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/3d/collision_object.cpp b/scene/3d/collision_object.cpp index b50878da07..373c356a45 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) { |