diff options
author | Anton Yabchinskiy <arn@bestmx.ru> | 2015-04-04 09:31:21 +0300 |
---|---|---|
committer | Anton Yabchinskiy <arn@bestmx.ru> | 2015-04-04 09:31:21 +0300 |
commit | 16746f157f83d666079ba3266acec13d35b84c3f (patch) | |
tree | 8c872d18ccdef90a15e72622cd0139e0e64801a6 /scene/2d/collision_polygon_2d.h | |
parent | 43713810deaadfec6a1656767cf5520073e58a06 (diff) | |
parent | 5d99e15e43d5a446b35d48e8a3b08a478f1998a9 (diff) |
Merge branch 'master' of github.com:okamstudio/godot
Diffstat (limited to 'scene/2d/collision_polygon_2d.h')
-rw-r--r-- | scene/2d/collision_polygon_2d.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scene/2d/collision_polygon_2d.h b/scene/2d/collision_polygon_2d.h index b8e27b6fb4..735110efad 100644 --- a/scene/2d/collision_polygon_2d.h +++ b/scene/2d/collision_polygon_2d.h @@ -51,6 +51,7 @@ protected: BuildMode build_mode; Vector<Point2> polygon; bool trigger; + bool unparenting; void _add_to_collision_object(Object *p_obj); void _update_parent(); |