asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove error print in area collision, should be a valid situation, closes #2463

Browse source
This commit is contained in:
Juan Linietsky 2015-12-31 11:15:49 -03:00
parent 8dad6415b1
commit 1e65c3c701
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/2d/area_2d.cpp
View file

@ -383,7 +383,11 @@ void Area2D::_clear_monitoring() {
Object *obj = ObjectDB::get_instance(E->key());
Node *node = obj ? obj->cast_to<Node>() : NULL;
ERR_CONTINUE(!node);
if (!node) //node may have been deleted in previous frame, this should not be an error
continue;
//ERR_CONTINUE(!node);
if (!E->get().in_tree)
continue;

3
servers/physics_2d/body_2d_sw.cpp
View file

@ -394,8 +394,7 @@ void Body2DSW::_compute_area_gravity_and_dampenings(const Area2DSW *p_area) {
}
area_linear_damp += p_area->get_linear_damp();
area_angular_damp += p_area->get_angular_damp();
printf("%f\n",gravity.y);
area_angular_damp += p_area->get_angular_damp();
}
void Body2DSW::integrate_forces(real_t p_step) {