diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-01-24 00:47:22 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-24 00:47:22 -0300 |
| commit | e3ca1c5c132023f3b57cbf45141ad90fc27e15a0 (patch) | |
| tree | 5b0078acda24eb2dcb1644dbe78663361ca0be21 /scene | |
| parent | 2fce78ad10d0c1457735a71544955dd7c991fcde (diff) | |
| parent | d01f55a78eb08e5645310f17caac0ae49647a013 (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'scene')
| -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 9b0c24ffd6..3a45b0c84e 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 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) { |