Skip to content

fix Tr2GrannyAnimation crash #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ccp-intern merged 1 commit into from
Oct 5, 2026
Merged

fix Tr2GrannyAnimation crash #115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions trinity/Tr2GrannyAnimation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ void Tr2GrannyAnimation::RebuildCachedData( BlueAsyncRes* p )
return;
}

if( m_grannyRes )
if( p == m_grannyRes )
{
if( m_grannyRes->IsUsingCMF() )
{
Expand All @@ -574,6 +574,13 @@ void Tr2GrannyAnimation::RebuildCachedData( BlueAsyncRes* p )
#endif
}

BlueAsyncRes* dataSource = m_grannyRes ? static_cast<BlueAsyncRes*>( m_grannyRes ) : m_geometryRes;
if( !dataSource->IsGood() )
{
// DoPrepare of the resource might have earlied out due to IsResourceCreationAllowed.
return;
}

if( IsUsingCMF() )
{
const cmf::Data* cmfData = GetCMFData();
Expand Down Expand Up @@ -661,6 +668,8 @@ void Tr2GrannyAnimation::RebuildCachedData( BlueAsyncRes* p )
m_pose.skeleton = nullptr;
m_tmpPose.boneTransforms.clear();
m_tmpPose.skeleton = nullptr;
m_sampledPose.boneTransforms.clear();
m_sampledPose.skeleton = nullptr;
m_skeletonBoneIndices.clear();
m_worldTransforms.clear();

Expand Down Expand Up @@ -1696,7 +1705,10 @@ void Tr2GrannyAnimation::PrePhysicsAnimation( Be::Time time, const Matrix& model
{
if( IsInitialized() && m_animationEnabled )
{
auto& skeleton = GetCMFData()->skeletons[m_modelIndex];
auto skeletonPtr = GetSkeleton();
CCP_ASSERT_M( skeletonPtr, "Tr2GrannyAnimation::PrePhysicsAnimation IsInitialized is true, but skeletonPtr is null!" );

auto& skeleton = *skeletonPtr;
float animationTime = GetAnimationTime();

m_morphAnimations.clear();
Expand Down Expand Up @@ -1884,6 +1896,10 @@ void Tr2GrannyAnimation::Cleanup()

m_pose.boneTransforms.clear();
m_pose.skeleton = nullptr;
m_tmpPose.boneTransforms.clear();
m_tmpPose.skeleton = nullptr;
m_sampledPose.boneTransforms.clear();
m_sampledPose.skeleton = nullptr;
m_skeletonBoneIndices.clear();
m_worldTransforms.clear();
m_boneBounds.clear();
Expand Down Expand Up @@ -2068,8 +2084,10 @@ void Tr2GrannyAnimation::AddAnimationLayer( const char* layerName, float layerWe
{
if( !m_tmpPose.skeleton )
{
auto& skeleton = GetCMFData()->skeletons[m_modelIndex];
cmf::RestPose( m_tmpPose, skeleton );
auto skeletonPtr = GetSkeleton();
CCP_ASSERT_M( skeletonPtr, "Tr2GrannyAnimation::AddAnimationLayer IsInitialized is true, but skeletonPtr is null!" );

cmf::RestPose( m_tmpPose, *skeletonPtr );
}
}
#if WITH_GRANNY
Expand Down Expand Up @@ -2209,8 +2227,10 @@ void Tr2GrannyAnimation::AddAnimationLayerWithTrackMask( const char* layerName,
{
if( !m_tmpPose.skeleton )
{
auto& skeleton = GetCMFData()->skeletons[m_modelIndex];
cmf::RestPose( m_tmpPose, skeleton );
auto skeletonPtr = GetSkeleton();
CCP_ASSERT_M( skeletonPtr, "Tr2GrannyAnimation::AddAnimationLayerWithTrackMask IsInitialized is true, but skeletonPtr is null!" );

cmf::RestPose( m_tmpPose, *skeletonPtr );
}
}
#if WITH_GRANNY
Expand Down
Loading