From 211fee73e2d28cad6b755a281c744c99ef92fa70 Mon Sep 17 00:00:00 2001 From: Mira Grudzinska Date: Wed, 21 May 2025 00:41:10 +0200 Subject: [PATCH] lottie: fix precomposition with masking 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. --- src/loaders/lottie/tvgLottieBuilder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/loaders/lottie/tvgLottieBuilder.cpp b/src/loaders/lottie/tvgLottieBuilder.cpp index f0cada5c..44d729ca 100644 --- a/src/loaders/lottie/tvgLottieBuilder.cpp +++ b/src/loaders/lottie/tvgLottieBuilder.cpp @@ -1174,8 +1174,8 @@ void LottieBuilder::updateMasks(LottieLayer* layer, float frameNo) { if (layer->masks.count == 0) return; - //Introduce an intermediate scene for embracing the matte + masking - if (layer->matteTarget) { + //Introduce an intermediate scene for embracing matte + masking or precomp clipping + masking replaced by clipping + if (layer->matteTarget || layer->type == LottieLayer::Precomp) { auto scene = Scene::gen(); scene->push(layer->scene); layer->scene = scene;