diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-05 18:51:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-05 18:51:29 +0200 |
commit | a5d7b49342275a637c5c20e6029ce739a5b32159 (patch) | |
tree | 6c04b86908f5eb08a597fbdc8058a4bc657d45e0 | |
parent | 198b49d8b589e88a5ae61fc8418ebf8890d2d1f7 (diff) | |
parent | 2ceba818c36e627b89269ec4a939cf685ef555a3 (diff) |
Merge pull request #53428 from akien-mga/4.x/27790-viewport-error-fix
Fix ViewportTexture error when viewport is used from a child scene
-rw-r--r-- | scene/main/viewport.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index b3b743370b..e88bb3b952 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."); |