godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #52365 from jitspoe/3.x.viewport_error_fix 

[3.x] Fix ViewportTexture error when viewport is used from a child scene
This commit is contained in:
Rémi Verschelde 2021-10-05 18:51:51 +02:00 committed by GitHub
parent e848da3a5d d2637ca950
commit d35fccb651
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scene/main/viewport.cpp
View File

@ -54,17 +54,17 @@
#include "servers/physics_2d_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.");