Эх сурвалжийг харах

[godot] Fix const assignments in SpineAtlasResource::copy_from()

Mario Zechner 1 жил өмнө
parent
commit
b3e8821966

+ 1 - 2
spine-godot/spine_godot/SpineAtlasResource.cpp

@@ -239,9 +239,8 @@ Error SpineAtlasResource::copy_from(const Ref<Resource> &p_resource) {
 	const Ref<SpineAtlasResource> &spineAtlas = static_cast<const Ref<SpineAtlasResource> &>(p_resource);
 	const Ref<SpineAtlasResource> &spineAtlas = static_cast<const Ref<SpineAtlasResource> &>(p_resource);
 	this->clear();
 	this->clear();
 	this->atlas = spineAtlas->atlas;
 	this->atlas = spineAtlas->atlas;
-	spineAtlas->atlas = nullptr;
 	this->texture_loader = spineAtlas->texture_loader;
 	this->texture_loader = spineAtlas->texture_loader;
-	spineAtlas->texture_loader = nullptr;
+	spineAtlas->clear_native_data();
 
 
 	this->source_path = spineAtlas->source_path;
 	this->source_path = spineAtlas->source_path;
 	this->atlas_data = spineAtlas->atlas_data;
 	this->atlas_data = spineAtlas->atlas_data;

+ 5 - 0
spine-godot/spine_godot/SpineAtlasResource.h

@@ -76,6 +76,11 @@ public:
 	Array get_textures();
 	Array get_textures();
 
 
 	Array get_normal_maps();
 	Array get_normal_maps();
+
+	void clear_native_data() {
+		this->atlas = nullptr;
+		this->texture_loader = nullptr;
+	}
 };
 };
 
 
 class SpineAtlasResourceFormatLoader : public ResourceFormatLoader {
 class SpineAtlasResourceFormatLoader : public ResourceFormatLoader {