godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9830 from RandomShaper/fix-9692 

Fix crash in Space2DSW::test_body_motion()
This commit is contained in:
Rémi Verschelde 2017-07-25 08:11:17 +02:00 committed by GitHub
parent 233baf9208 b4129df96c
commit f981829749
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/physics_2d/space_2d_sw.cpp
View File

@ -553,7 +553,7 @@ bool Space2DSW::test_body_motion(Body2DSW *p_body, const Transform2D &p_from, co
const CollisionObject2DSW *col_obj = intersection_query_results[i]; const CollisionObject2DSW *col_obj = intersection_query_results[i];
int shape_idx = intersection_query_subindex_results[i]; int shape_idx = intersection_query_subindex_results[i];
if (col_obj->is_shape_set_as_one_way_collision(j)) { if (col_obj->is_shape_set_as_one_way_collision(shape_idx)) {
cbk.valid_dir = body_shape_xform.get_axis(1).normalized(); cbk.valid_dir = body_shape_xform.get_axis(1).normalized();
cbk.valid_depth = p_margin; //only valid depth is the collision margin cbk.valid_depth = p_margin; //only valid depth is the collision margin