Fix Viewport Texture must be set to use it

Hilderin · Sep 15, 2024 · a0adc4a · a0adc4a
1 parent 6681f25
commit a0adc4a
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
@@ -111,6 +111,9 @@ void ViewportTexture::set_viewport_path_in_scene(const NodePath &p_path) {
  if (get_local_scene() && !path.is_empty()) {
  setup_local_to_scene();
  } else {
+ if (path.is_empty()) {
+ vp_changed = false;
+ }
  emit_changed();
  }
 }
@@ -121,7 +124,7 @@ NodePath ViewportTexture::get_viewport_path_in_scene() const {
 
 int ViewportTexture::get_width() const {
  if (!vp) {
- if (!vp_pending) {
+ if (!vp_pending && !vp_changed) {
  ERR_PRINT("Viewport Texture must be set to use it.");
  }
  return 0;
@@ -131,7 +134,7 @@ int ViewportTexture::get_width() const {
 
 int ViewportTexture::get_height() const {
  if (!vp) {
- if (!vp_pending) {
+ if (!vp_pending && !vp_changed) {
  ERR_PRINT("Viewport Texture must be set to use it.");
  }
  return 0;
@@ -141,7 +144,7 @@ int ViewportTexture::get_height() const {
 
 Size2 ViewportTexture::get_size() const {
  if (!vp) {
- if (!vp_pending) {
+ if (!vp_pending && !vp_changed) {
  ERR_PRINT("Viewport Texture must be set to use it.");
  }
  return Size2();
@@ -163,7 +166,7 @@ bool ViewportTexture::has_alpha() const {
 
 Ref<Image> ViewportTexture::get_image() const {
  if (!vp) {
- if (!vp_pending) {
+ if (!vp_pending && !vp_changed) {
  ERR_PRINT("Viewport Texture must be set to use it.");
  }
  return Ref<Image>();