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/collision_object.cpp | |
| 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/collision_object.cpp')
| -rw-r--r-- | scene/3d/collision_object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/3d/collision_object.cpp b/scene/3d/collision_object.cpp index 47d29cec1c..82158405ea 100644 --- a/scene/3d/collision_object.cpp +++ b/scene/3d/collision_object.cpp @@ -199,9 +199,9 @@ void CollisionObject::_mouse_exit() { } void CollisionObject::_update_pickable() { - if (!is_inside_scene()) + if (!is_inside_tree()) return; - bool pickable = ray_pickable && is_inside_scene() && is_visible(); + bool pickable = ray_pickable && is_inside_tree() && is_visible(); if (area) PhysicsServer::get_singleton()->area_set_ray_pickable(rid,pickable); else |