|
@@ -1249,13 +1249,13 @@ Animation *SkeletonBinary::readAnimation(const String &name, DataInput *input, S
|
|
|
setError("Attachment not found: ", attachmentName);
|
|
|
return NULL;
|
|
|
}
|
|
|
- VertexAttachment *attachment = static_cast<VertexAttachment *>(baseAttachment);
|
|
|
unsigned int timelineType = readByte(input);
|
|
|
int frameCount = readVarint(input, true);
|
|
|
int frameLast = frameCount - 1;
|
|
|
|
|
|
switch (timelineType) {
|
|
|
case ATTACHMENT_DEFORM: {
|
|
|
+ VertexAttachment *attachment = static_cast<VertexAttachment *>(baseAttachment);
|
|
|
bool weighted = attachment->_bones.size() > 0;
|
|
|
Vector<float> &vertices = attachment->_vertices;
|
|
|
int deformLength = weighted ? (int) vertices.size() / 3 * 2 : (int) vertices.size();
|
|
@@ -1311,7 +1311,7 @@ Animation *SkeletonBinary::readAnimation(const String &name, DataInput *input, S
|
|
|
break;
|
|
|
}
|
|
|
case ATTACHMENT_SEQUENCE: {
|
|
|
- SequenceTimeline *timeline = new (__FILE__, __LINE__) SequenceTimeline(frameCount, slotIndex, attachment);
|
|
|
+ SequenceTimeline *timeline = new (__FILE__, __LINE__) SequenceTimeline(frameCount, slotIndex, baseAttachment);
|
|
|
for (int frame = 0; frame < frameCount; frame++) {
|
|
|
float time = readFloat(input);
|
|
|
int modeAndIndex = readInt(input);
|