Merge pull request #8408 from 20kdc/bugfix-kine-mas

Apply is_ceiling/is_wall swap fix to 2D move_and_slide
This commit is contained in:
Rémi Verschelde 2017-04-24 11:25:08 +02:00 committed by GitHub
commit 8032dd18dd

View file

@ -1199,7 +1199,7 @@ Vector2 KinematicBody2D::move_and_slide(const Vector2 &p_linear_velocity, const
revert_motion(); revert_motion();
return Vector2(); return Vector2();
} }
} else if (get_collision_normal().dot(-p_floor_direction) <= Math::cos(p_floor_max_angle)) { //ceiling } else if (get_collision_normal().dot(-p_floor_direction) >= Math::cos(p_floor_max_angle)) { //ceiling
move_and_slide_on_ceiling = true; move_and_slide_on_ceiling = true;
} else { } else {
move_and_slide_on_wall = true; move_and_slide_on_wall = true;