From 1c6de8ff47fc52959d954d88a9f3bd4bfbc079b6 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Mon, 3 Oct 2022 14:55:08 +0200 Subject: [PATCH] [cocos2dx] Fix merged code. --- spine-cocos2dx/spine-cocos2dx/src/spine/SkeletonRenderer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spine-cocos2dx/spine-cocos2dx/src/spine/SkeletonRenderer.cpp b/spine-cocos2dx/spine-cocos2dx/src/spine/SkeletonRenderer.cpp index be2aff3bb..5bf203994 100644 --- a/spine-cocos2dx/spine-cocos2dx/src/spine/SkeletonRenderer.cpp +++ b/spine-cocos2dx/spine-cocos2dx/src/spine/SkeletonRenderer.cpp @@ -284,7 +284,7 @@ namespace spine { if (slot->getAttachment()->getRTTI().isExactly(RegionAttachment::rtti)) { RegionAttachment *attachment = static_cast(slot->getAttachment()); - texture = (Texture2D*)((AtlasRegion*)attachment->getRegion())->page->getRendererObject(); + texture = (Texture2D*)((AtlasRegion*)attachment->getRegion())->page->texture; float *dstTriangleVertices = nullptr; int dstStride = 0;// in floats @@ -322,7 +322,7 @@ namespace spine { color = attachment->getColor(); } else if (slot->getAttachment()->getRTTI().isExactly(MeshAttachment::rtti)) { MeshAttachment *attachment = (MeshAttachment *) slot->getAttachment(); - texture = (Texture2D*)((AtlasRegion*)attachment->getRegion())->page->getRendererObject(); + texture = (Texture2D*)((AtlasRegion*)attachment->getRegion())->page->texture; float *dstTriangleVertices = nullptr; int dstStride = 0;// in floats