diff options
| author | Anton Yabchinskiy <arn@bestmx.ru> | 2014-12-09 17:51:14 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy <arn@bestmx.ru> | 2014-12-09 17:51:14 +0300 |
| commit | ff755f93eb86e3f7f6801918457ca77a3001671b (patch) | |
| tree | 58d6def002b427db665a504f08d25eae335bd9d9 /scene/2d/area_2d.h | |
| parent | d45be7d9f43046365fcfbf97420f9eca636c51e7 (diff) | |
| parent | be4e40e90a5a322f6a7cec4893854ef5b15db600 (diff) | |
Merge branch 'master' of http://github.com/okamstudio/godot
Diffstat (limited to 'scene/2d/area_2d.h')
| -rw-r--r-- | scene/2d/area_2d.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scene/2d/area_2d.h b/scene/2d/area_2d.h index c6210e7c9a..2044cc7db0 100644 --- a/scene/2d/area_2d.h +++ b/scene/2d/area_2d.h @@ -52,6 +52,7 @@ private: real_t density; int priority; bool monitoring; + bool locked; void _body_inout(int p_status,const RID& p_body, int p_instance, int p_body_shape,int p_area_shape); |