From 2ceba818c36e627b89269ec4a939cf685ef555a3 Mon Sep 17 00:00:00 2001 From: jitspoe Date: Thu, 2 Sep 2021 20:40:52 -0400 Subject: [PATCH] Fix ViewportTexture error when viewport is used from a child scene Fix invalid errors when a separate child scene file contains a viewport and that viewport is used for a texture in the current scene. Fixes #27790. --- scene/main/viewport.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index b3b743370b6..e88bb3b952b 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -57,17 +57,17 @@ #include "servers/audio_server.h" void ViewportTexture::setup_local_to_scene() { + Node *local_scene = get_local_scene(); + if (!local_scene) { + return; + } + if (vp) { vp->viewport_textures.erase(this); } vp = nullptr; - Node *local_scene = get_local_scene(); - if (!local_scene) { - return; - } - Node *vpn = local_scene->get_node(path); ERR_FAIL_COND_MSG(!vpn, "ViewportTexture: Path to node is invalid.");