diff options
| author | aap <aap@papnet.eu> | 2020-05-11 09:18:41 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-11 09:18:41 +0200 |
| commit | b11715608f5d12d82ecb364b0d2dc76c24d6ab1f (patch) | |
| tree | 89ee629dac2cee3c3ab7020e394a50f1054c186d /src/animation/RpAnimBlend.cpp | |
| parent | Merge pull request #509 from Fire-Head/master (diff) | |
| download | re3-b11715608f5d12d82ecb364b0d2dc76c24d6ab1f.tar re3-b11715608f5d12d82ecb364b0d2dc76c24d6ab1f.tar.gz re3-b11715608f5d12d82ecb364b0d2dc76c24d6ab1f.tar.bz2 re3-b11715608f5d12d82ecb364b0d2dc76c24d6ab1f.tar.lz re3-b11715608f5d12d82ecb364b0d2dc76c24d6ab1f.tar.xz re3-b11715608f5d12d82ecb364b0d2dc76c24d6ab1f.tar.zst re3-b11715608f5d12d82ecb364b0d2dc76c24d6ab1f.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/animation/RpAnimBlend.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/animation/RpAnimBlend.cpp b/src/animation/RpAnimBlend.cpp index d3e10889..be70ad66 100644 --- a/src/animation/RpAnimBlend.cpp +++ b/src/animation/RpAnimBlend.cpp @@ -348,9 +348,11 @@ CAnimBlendAssociation* RpAnimBlendClumpGetFirstAssociation(RpClump *clump) { CAnimBlendClumpData *clumpData = *RPANIMBLENDCLUMPDATA(clump); - if(clumpData == nil) return nil; - if(clumpData->link.next == nil) return nil; - return CAnimBlendAssociation::FromLink(clumpData->link.next); + if(!RpAnimBlendClumpIsInitialized(clump)) + return nil; + if(clumpData->link.next) + return CAnimBlendAssociation::FromLink(clumpData->link.next); + return nil; } // FillFrameArrayCallBack on PS2 |