From 899fd11825b27abbb08884ce3b4b0c9450f23cb9 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Tue, 13 Sep 2022 10:26:19 +0200 Subject: [PATCH] [godot] Fix up HasRendererObject changes/removal. --- spine-godot/spine_godot/SpineAtlasResource.cpp | 4 ++-- spine-godot/spine_godot/SpineSprite.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spine-godot/spine_godot/SpineAtlasResource.cpp b/spine-godot/spine_godot/SpineAtlasResource.cpp index 5665c0306..496a1157f 100644 --- a/spine-godot/spine_godot/SpineAtlasResource.cpp +++ b/spine-godot/spine_godot/SpineAtlasResource.cpp @@ -75,7 +75,7 @@ public: auto renderer_object = memnew(SpineRendererObject); renderer_object->texture = Ref(nullptr); renderer_object->normal_map = Ref(nullptr); - page.setRendererObject((void *) renderer_object); + page.texture = (void *) renderer_object; return; } @@ -97,7 +97,7 @@ public: renderer_object->canvas_texture->set_normal_texture(renderer_object->normal_map); #endif - page.setRendererObject((void *) renderer_object); + page.texture = (void *) renderer_object; page.width = texture->get_width(); page.height = texture->get_height(); } diff --git a/spine-godot/spine_godot/SpineSprite.cpp b/spine-godot/spine_godot/SpineSprite.cpp index 9eb9ceb7c..68d2c7b96 100644 --- a/spine-godot/spine_godot/SpineSprite.cpp +++ b/spine-godot/spine_godot/SpineSprite.cpp @@ -552,7 +552,7 @@ void SpineSprite::update_meshes(Ref skeleton_ref) { if (attachment->getRTTI().isExactly(spine::RegionAttachment::rtti)) { auto *region = (spine::RegionAttachment *) attachment; - renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) region->getRendererObject())->page->getRendererObject(); + renderer_object = (SpineRendererObject *) region->getRegion()->rendererObject; vertices->setSize(8, 0); region->computeWorldVertices(*slot, *vertices, 0); @@ -566,7 +566,7 @@ void SpineSprite::update_meshes(Ref skeleton_ref) { tint.a *= attachment_color.a; } else if (attachment->getRTTI().isExactly(spine::MeshAttachment::rtti)) { auto *mesh = (spine::MeshAttachment *) attachment; - renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) mesh->getRendererObject())->page->getRendererObject(); + renderer_object = (SpineRendererObject *) mesh->getRegion()->rendererObject; vertices->setSize(mesh->getWorldVerticesLength(), 0); mesh->computeWorldVertices(*slot, *vertices);