Skip to content

Check for layer parent-child cycles. #262

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

Open
john-preston wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −1
Open

Check for layer parent-child cycles. #262

Show file tree
Hide file tree
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
15 changes: 14 additions & 1 deletion src/lottie/lottieitem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,16 @@ static bool strokeProp(rlottie::Property prop)
}
}

static bool isGoodParentLayer(LOTLayerItem *parent, LOTLayerItem *child) {
do {
if (parent == child) {
return false;
}
parent = parent->resolvedParentLayer();
} while (parent);
return true;
}

LOTCompItem::LOTCompItem(LOTModel *model)
: mCurFrameNo(-1)
{
Expand Down Expand Up @@ -435,7 +445,10 @@ LOTCompLayerItem::LOTCompLayerItem(LOTLayerData *layerModel)
auto search =
std::find_if(mLayers.begin(), mLayers.end(),
[id](const auto &val) { return val->id() == id; });
if (search != mLayers.end()) layer->setParentLayer((*search).get());
if (search != mLayers.end() &&
isGoodParentLayer((*search).get(), layer.get())) {
layer->setParentLayer((*search).get());
}
}
}

Expand Down
1 change: 1 addition & 0 deletions src/lottie/lottieitem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ class LOTLayerItem
int id() const {return mLayerData->id();}
int parentId() const {return mLayerData->parentId();}
void setParentLayer(LOTLayerItem *parent){mParentLayer = parent;}
LOTLayerItem *resolvedParentLayer() const {return mParentLayer;}
void setComplexContent(bool value) { mComplexContent = value;}
bool complexContent() const {return mComplexContent;}
virtual void update(int frameNo, const VMatrix &parentMatrix, float parentAlpha);
Expand Down