From d790429cd1f11354ca5deb040b86effd79122a76 Mon Sep 17 00:00:00 2001 From: badlogic Date: Tue, 11 Jun 2019 15:31:42 +0200 Subject: [PATCH] [c][cpp] Ported active bone check in SkeletonBounds. See #1378. --- spine-c/spine-c/src/spine/SkeletonBounds.c | 1 + spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/spine-c/spine-c/src/spine/SkeletonBounds.c b/spine-c/spine-c/src/spine/SkeletonBounds.c index 91392680d..ad8852f3e 100644 --- a/spine-c/spine-c/src/spine/SkeletonBounds.c +++ b/spine-c/spine-c/src/spine/SkeletonBounds.c @@ -129,6 +129,7 @@ void spSkeletonBounds_update (spSkeletonBounds* self, spSkeleton* skeleton, int/ spBoundingBoxAttachment* boundingBox; spSlot* slot = skeleton->slots[i]; + if (!slot->bone->active) continue; spAttachment* attachment = slot->attachment; if (!attachment || attachment->type != SP_ATTACHMENT_BOUNDING_BOX) continue; boundingBox = (spBoundingBoxAttachment*)attachment; diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp index ac673a595..5ca383e5a 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -56,6 +57,8 @@ void SkeletonBounds::update(Skeleton &skeleton, bool updateAabb) { for (size_t i = 0; i < slotCount; i++) { Slot *slot = slots[i]; + if (!slot->getBone().isActive()) continue; + Attachment *attachment = slot->getAttachment(); if (attachment == NULL || !attachment->getRTTI().instanceOf(BoundingBoxAttachment::rtti)) { continue;