summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-08-08 19:04:12 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-08-08 19:04:12 -0300
commit37b5e99bc27a2a6a915accb814b0b618c66b0bb7 (patch)
tree89c7dc8c0ccb1889a6b2aefe7ecaf4240f355c18
parentdf6dbadc3efa3c0f36b6c3c8992dba153e303254 (diff)
prevent bug due to scripts not working in editor and notifier sending signals to it.
-rw-r--r--scene/2d/visibility_notifier_2d.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/scene/2d/visibility_notifier_2d.cpp b/scene/2d/visibility_notifier_2d.cpp
index 5411950976..852bc187d2 100644
--- a/scene/2d/visibility_notifier_2d.cpp
+++ b/scene/2d/visibility_notifier_2d.cpp
@@ -40,6 +40,9 @@ void VisibilityNotifier2D::_enter_viewport(Viewport* p_viewport) {
ERR_FAIL_COND(viewports.has(p_viewport));
viewports.insert(p_viewport);
+ if (is_inside_tree() && get_tree()->is_editor_hint())
+ return;
+
if (viewports.size()==1) {
emit_signal(SceneStringNames::get_singleton()->enter_screen);
@@ -54,6 +57,9 @@ void VisibilityNotifier2D::_exit_viewport(Viewport* p_viewport){
ERR_FAIL_COND(!viewports.has(p_viewport));
viewports.erase(p_viewport);
+ if (is_inside_tree() && get_tree()->is_editor_hint())
+ return;
+
emit_signal(SceneStringNames::get_singleton()->exit_viewport,p_viewport);
if (viewports.size()==0) {
emit_signal(SceneStringNames::get_singleton()->exit_screen);