Pass combinedAlpha when not complexContent.

Change-Id: I3daaca93a6fa6bb3a71ccd4d98d263ae966b61ee

diff --git a/src/lottie/lottieitem.cpp b/src/lottie/lottieitem.cpp
index 15e00da0939d82134aa7b2c3bef50c085bea1688..d6c9ed382ba2f2d3bb942a64484ee66c41a3d2f5 100644 (file)
--- a/src/lottie/lottieitem.cpp
+++ b/src/lottie/lottieitem.cpp
@@ -1317,9 +1317,9 @@ renderer::Stroke::Stroke(model::Stroke *data)
 static vthread_local std::vector<float> Dash_Vector;
 
 bool renderer::Stroke::updateContent(int frameNo, const VMatrix &matrix,
-                                     float)
+                                     float alpha)
 {
-    auto combinedAlpha = mModel.opacity(frameNo);
+    auto combinedAlpha = alpha * mModel.opacity(frameNo);
     auto color = mModel.color(frameNo).toColor(combinedAlpha);
 
     VBrush brush(color);

diff --git a/src/lottie/lottieitem_capi.cpp b/src/lottie/lottieitem_capi.cpp
index 31ca54a68b64609ab52bb3a90421c1523ae4b502..048e356db2596e3dada38c455f7882509786bb9b 100644 (file)
--- a/src/lottie/lottieitem_capi.cpp
+++ b/src/lottie/lottieitem_capi.cpp
@@ -88,7 +88,7 @@ void renderer::Layer::buildLayerNode()
         mCApiData = std::make_unique<renderer::CApiData>();
         clayer().keypath = name();
     }
-    if (complexContent()) clayer().mAlpha = uint8_t(combinedAlpha() * 255.f);
+    if (!complexContent()) clayer().mAlpha = uint8_t(combinedAlpha() * 255.f);
     clayer().mVisible = visible();
     // update matte
     if (hasMatte()) {