godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

SceneMainLoop -> SceneTree

Browse Source 
-=-=-=-=-=-=-=-=-=-=-=-=-=-

*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
This commit is contained in:
Juan Linietsky
2014-11-05 21:20:42 -03:00
parent d14baf6e41
commit 0dbedd18fc
168 changed files with 1534 additions and 1310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scene/3d/collision_object.cpp
View File

@@ -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