summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2023-02-20 22:46:31 +0100
committerGitHub <noreply@github.com>2023-02-20 22:46:31 +0100
commit62d4d8bfc63506fe382ae21cfe040fe4f03df8c8 (patch)
treed66b8654d4f81d7bb769eae01664442330a2a72f /editor
parent0851debf4500de68d5ee5c40e3e942c47c70214e (diff)
parent56251cf08c52759268c1752942e30ffaf920755e (diff)
Merge pull request #73634 from KoBeWi/merged_into_error
Fix tile atlas merging crash
Diffstat (limited to 'editor')
-rw-r--r--editor/plugins/tiles/atlas_merging_dialog.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/editor/plugins/tiles/atlas_merging_dialog.cpp b/editor/plugins/tiles/atlas_merging_dialog.cpp
index eaf72d36ba..8404ea0969 100644
--- a/editor/plugins/tiles/atlas_merging_dialog.cpp
+++ b/editor/plugins/tiles/atlas_merging_dialog.cpp
@@ -245,7 +245,9 @@ bool AtlasMergingDialog::_get(const StringName &p_name, Variant &r_ret) const {
void AtlasMergingDialog::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_VISIBILITY_CHANGED: {
- _update_texture();
+ if (is_visible()) {
+ _update_texture();
+ }
} break;
}
}