git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-08 05:33:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

lottie: fix precomposition with masking
Some checks failed
Android / build_x86_64 (push) Has been cancelled
Details
Android / build_aarch64 (push) Has been cancelled
Details
iOS / build_x86_64 (push) Has been cancelled
Details
iOS / build_arm64 (push) Has been cancelled
Details
macOS / build (push) Has been cancelled
Details
macOS / compact_test (push) Has been cancelled
Details
macOS / unit_test (push) Has been cancelled
Details
Ubuntu / build (push) Has been cancelled
Details
Ubuntu / compact_test (push) Has been cancelled
Details
Ubuntu / unit_test (push) Has been cancelled
Details
Windows / build (push) Has been cancelled
Details
Windows / compact_test (push) Has been cancelled
Details
Windows / unit_test (push) Has been cancelled
Details

Browse source 
A precomposition layer is clipped to its viewport.
If the same layer also had a mask that was optimized
using clipping, this clip was unintentionally overridden
by the viewport clipping. This conflict is now fixed.
This commit is contained in:
Mira Grudzinska 2025-05-21 00:41:10 +02:00 • committed by Hermet Park
parent 55847bdcb3
commit 211fee73e2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1174,8 +1174,8 @@ void LottieBuilder::updateMasks(LottieLayer* layer, float frameNo)
{ {
if (layer->masks.count == 0) return; if (layer->masks.count == 0) return;
//Introduce an intermediate scene for embracing the matte + masking //Introduce an intermediate scene for embracing matte + masking or precomp clipping + masking replaced by clipping
if (layer->matteTarget) { if (layer->matteTarget || layer->type == LottieLayer::Precomp) {
auto scene = Scene::gen(); auto scene = Scene::gen();
scene->push(layer->scene); scene->push(layer->scene);
layer->scene = scene; layer->scene = scene;