From abd0dcac88deead8da28994a18daac47884d7047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= Date: Fri, 28 Jul 2023 11:52:09 +0200 Subject: [PATCH] Fix life cycle of ResourceImporterTexture better --- editor/import/resource_importer_texture.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/editor/import/resource_importer_texture.cpp b/editor/import/resource_importer_texture.cpp index 793926214a6..57139a511f5 100644 --- a/editor/import/resource_importer_texture.cpp +++ b/editor/import/resource_importer_texture.cpp @@ -790,12 +790,16 @@ bool ResourceImporterTexture::are_import_settings_valid(const String &p_path) co ResourceImporterTexture *ResourceImporterTexture::singleton = nullptr; ResourceImporterTexture::ResourceImporterTexture() { - singleton = this; + if (!singleton) { + singleton = this; + } CompressedTexture2D::request_3d_callback = _texture_reimport_3d; CompressedTexture2D::request_roughness_callback = _texture_reimport_roughness; CompressedTexture2D::request_normal_callback = _texture_reimport_normal; } ResourceImporterTexture::~ResourceImporterTexture() { - singleton = nullptr; + if (singleton == this) { + singleton = nullptr; + } }