Merge pull request #66509 from Mickeon/yes

Support chaining AtlasTextures inside other AtlasTextures

1 files changed, 8 insertions, 0 deletions

diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp
index 15678c9281..5a03929f98 100644
--- a/scene/resources/texture.cpp
+++ b/scene/resources/texture.cpp
@@ -1489,7 +1489,15 @@ void AtlasTexture::set_atlas(const Ref<Texture2D> &p_atlas) {
 	if (atlas == p_atlas) {
 		return;
 	}
+	// Support recursive AtlasTextures.
+	if (Ref<AtlasTexture>(atlas).is_valid()) {
+		atlas->disconnect(CoreStringNames::get_singleton()->changed, callable_mp((Resource *)this, &AtlasTexture::emit_changed));
+	}
 	atlas = p_atlas;
+	if (Ref<AtlasTexture>(atlas).is_valid()) {
+		atlas->connect(CoreStringNames::get_singleton()->changed, callable_mp((Resource *)this, &AtlasTexture::emit_changed));
+	}
+
 	emit_changed();
 }