Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #2587 from eska014/fix-area2d-mask-matching

Browse source 
Fix Area/Area2D mask matching
This commit is contained in:
Juan Linietsky 2015-10-17 09:47:27 -03:00
commit a871fc9112
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
servers/physics_2d/space_2d_sw.cpp
View file

@ -36,8 +36,8 @@ _FORCE_INLINE_ static bool _match_object_type_query(CollisionObject2DSW *p_objec
if ((p_object->get_layer_mask()&p_layer_mask)==0)
return false;
if (p_object->get_type()==CollisionObject2DSW::TYPE_AREA && !(p_type_mask&Physics2DDirectSpaceState::TYPE_MASK_AREA))
return false;
if (p_object->get_type()==CollisionObject2DSW::TYPE_AREA)
return p_type_mask&Physics2DDirectSpaceState::TYPE_MASK_AREA;
Body2DSW *body = static_cast<Body2DSW*>(p_object);