diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-27 08:06:40 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-27 14:55:14 +0100 |
| commit | c3a760c5079670854b5f0c197c15218b1606bb2d (patch) | |
| tree | f5288f2b5d649fb55028a800e140ca00e865df40 /scene/main | |
| parent | eaae4b6408361eb34363adcb22a08046f43147f4 (diff) | |
Fix build with disable_3d=yes, remove dependency on WorldEnvironment
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/viewport.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index aaebd448b2..2f131631af 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1223,17 +1223,20 @@ void Viewport::_propagate_enter_world(Node *p_node) { if (!p_node->is_inside_tree()) //may not have entered scene yet return; +#ifndef _3D_DISABLED if (Object::cast_to<Node3D>(p_node) || Object::cast_to<WorldEnvironment>(p_node)) { - p_node->notification(Node3D::NOTIFICATION_ENTER_WORLD); } else { +#endif Viewport *v = Object::cast_to<Viewport>(p_node); if (v) { if (v->world.is_valid() || v->own_world.is_valid()) return; } +#ifndef _3D_DISABLED } +#endif } for (int i = 0; i < p_node->get_child_count(); i++) { @@ -1260,17 +1263,20 @@ void Viewport::_propagate_exit_world(Node *p_node) { if (!p_node->is_inside_tree()) //may have exited scene already return; +#ifndef _3D_DISABLED if (Object::cast_to<Node3D>(p_node) || Object::cast_to<WorldEnvironment>(p_node)) { - p_node->notification(Node3D::NOTIFICATION_EXIT_WORLD); } else { +#endif Viewport *v = Object::cast_to<Viewport>(p_node); if (v) { if (v->world.is_valid() || v->own_world.is_valid()) return; } +#ifndef _3D_DISABLED } +#endif } for (int i = 0; i < p_node->get_child_count(); i++) { |