浏览代码

Merge pull request #91123 from aaronp64/multi_viewport_crash

Fix `SubViewport`/`AudioStreamPlayer2D` crash
Rémi Verschelde 1 年之前
父节点
当前提交
a8337da037
共有 1 个文件被更改,包括 3 次插入0 次删除
  1. 3 0
      scene/main/viewport.cpp

+ 3 - 0
scene/main/viewport.cpp

@@ -5048,6 +5048,9 @@ Viewport::~Viewport() {
 	for (ViewportTexture *E : viewport_textures) {
 		E->vp = nullptr;
 	}
+	if (world_2d.is_valid()) {
+		world_2d->remove_viewport(this);
+	}
 	ERR_FAIL_NULL(RenderingServer::get_singleton());
 	RenderingServer::get_singleton()->free(viewport);
 }