mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-06 23:34:53 +08:00
[cocos2dx] Fix merged code.
This commit is contained in:
parent
63d3971ffe
commit
1c6de8ff47
@ -284,7 +284,7 @@ namespace spine {
|
||||
|
||||
if (slot->getAttachment()->getRTTI().isExactly(RegionAttachment::rtti)) {
|
||||
RegionAttachment *attachment = static_cast<RegionAttachment *>(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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user