git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-14 12:04:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

lottie/builder: correct a parenting error.

Browse source 
There is a missing case where a layer didn't parent properly,
especially when the parent is the matte target.
This commit is contained in:
Hermet Park 2023-09-20 11:38:52 +09:00 • committed by Hermet Park
parent 5b8c66f5c8
commit cba2b0f724
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/loaders/lottie/tvgLottieBuilder.cpp
View file

@ -869,12 +869,20 @@ static void _bulidHierarchy(LottieGroup* parent, LottieLayer* child)
{
if (child->pid == -1) return;
if (child->matte.target && child->pid == child->matte.target->id) {
child->parent = child->matte.target;
return;
}
for (auto p = parent->children.data; p < parent->children.end(); ++p) {
auto parent = static_cast<LottieLayer*>(*p);
if (child == parent) continue;
if (child->pid == parent->id) {
child->parent = parent;
parent->statical &= child->statical;
break;
}
if (parent->matte.target && parent->matte.target->id == child->pid) {
child->parent = parent->matte.target;
break;
}
}
@ -897,8 +905,7 @@ static bool _buildPrecomp(LottieComposition* comp, LottieGroup* parent)
//precomp referencing
if (child->matte.target->refId) _buildReference(comp, child->matte.target);
}
if (child->pid != -1) _bulidHierarchy(parent, child);
_bulidHierarchy(parent, child);
}
return true;
}