Merge pull request #79981 from RandomShaper/fix_res_imp_life_2

Fix life cycle of ResourceImporterTexture better
godotengine · Jul 29, 2023 · 75f9c97 · 75f9c97
2 parents 031aa99 + abd0dca
commit 75f9c97
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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;
+	}
 }