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/2d/collision_shape_2d.cpp | |
| parent | d14baf6e41bcdbe4968e0513beccc09dfb160ecd (diff) | |
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/2d/collision_shape_2d.cpp')
| -rw-r--r-- | scene/2d/collision_shape_2d.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/collision_shape_2d.cpp b/scene/2d/collision_shape_2d.cpp index 3f068f4ccc..9f35ade322 100644 --- a/scene/2d/collision_shape_2d.cpp +++ b/scene/2d/collision_shape_2d.cpp @@ -72,12 +72,12 @@ void CollisionShape2D::_notification(int p_what) { switch(p_what) { - case NOTIFICATION_ENTER_SCENE: { + case NOTIFICATION_ENTER_TREE: { unparenting=false; } break; case NOTIFICATION_LOCAL_TRANSFORM_CHANGED: { - if (!is_inside_scene()) + if (!is_inside_tree()) break; _update_parent(); |