Merge remote-tracking branch 'origin/master'

This commit is contained in:
NathanSweet 2013-04-15 11:17:30 +02:00
commit 92f946b159

View File

@ -192,7 +192,7 @@ CCRect CCSkeleton::boundingBox () {
for (int i = 0; i < skeleton->slotCount; ++i) {
Slot* slot = skeleton->slots[i];
Attachment* attachment = slot->attachment;
if (attachment->type != ATTACHMENT_REGION) continue;
if (!attachment || attachment->type != ATTACHMENT_REGION) continue;
Cocos2dxRegionAttachment* regionAttachment = SUB_CAST(Cocos2dxRegionAttachment, attachment);
minX = min(minX, regionAttachment->quad.bl.vertices.x);
minY = min(minY, regionAttachment->quad.bl.vertices.y);