diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-11-05 21:20:42 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-11-05 21:20:42 -0300 |
| commit | 0dbedd18fc62f700e92a4cf581e505d849bc47ad (patch) | |
| tree | 8f2c85b4d9227e441fd35ab4873009faa656bcba /scene/3d/physics_body.h | |
| parent | d14baf6e41bcdbe4968e0513beccc09dfb160ecd (diff) | |
| download | redot-engine-0dbedd18fc62f700e92a4cf581e505d849bc47ad.tar.gz | |
SceneMainLoop -> SceneTree
-=-=-=-=-=-=-=-=-=-=-=-=-=-
*YOUR SOURCE MIGHT NOT WORK*
For mor information on fix:
https://github.com/okamstudio/godot/wiki/devel_scene_tree
Other stuff:
-Shower of bullets demo
-Fixes all around
Diffstat (limited to 'scene/3d/physics_body.h')
| -rw-r--r-- | scene/3d/physics_body.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h index a19ad48c87..f9f028e20d 100644 --- a/scene/3d/physics_body.h +++ b/scene/3d/physics_body.h @@ -163,7 +163,7 @@ private: struct BodyState { //int rc; - bool in_scene; + bool in_tree; VSet<ShapePair> shapes; }; @@ -176,8 +176,8 @@ private: ContactMonitor *contact_monitor; - void _body_enter_scene(ObjectID p_id); - void _body_exit_scene(ObjectID p_id); + void _body_enter_tree(ObjectID p_id); + void _body_exit_tree(ObjectID p_id); void _body_inout(int p_status, ObjectID p_instance, int p_body_shape,int p_local_shape); |