diff options
author | Antti Määttä <antti.maatta@qt.io> | 2019-12-03 14:24:24 +0200 |
---|---|---|
committer | Antti Määttä <antti.maatta@qt.io> | 2019-12-04 11:15:52 +0200 |
commit | 24b10f52ca19366a9ebd75870d5a02f384253fd9 (patch) | |
tree | 766ea03f59f8cb1ec1a74490ad9e21b0707ace64 | |
parent | 202a62808527d5f29be777bb660b5111763236b8 (diff) |
Fix qml subpresentation alpha premultiply setting
Task-number: QT3DS-4017
Change-Id: Ia5888f3c44f2ef2dc981a2a13893a21a28f01f41
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r-- | src/runtimerender/graphobjects/Qt3DSRenderImage.cpp | 2 | ||||
-rw-r--r-- | src/runtimerender/q3dsqmlrender.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp b/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp index f91fb65..1910d70 100644 --- a/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp +++ b/src/runtimerender/graphobjects/Qt3DSRenderImage.cpp @@ -60,7 +60,7 @@ static void HandleOffscreenResult(SImage &theImage, SImageTextureData &newImage, { newImage.m_Texture = theResult.m_Texture; newImage.m_TextureFlags.SetHasTransparency(theResult.m_HasTransparency); - newImage.m_TextureFlags.SetPreMultiplied(true); + newImage.m_TextureFlags.SetPreMultiplied(theResult.m_HasTransparency); wasDirty = wasDirty || theResult.m_HasChangedSinceLastFrame; theImage.m_LastFrameOffscreenRenderer = theResult.m_Renderer; replaceTexture = true; diff --git a/src/runtimerender/q3dsqmlrender.cpp b/src/runtimerender/q3dsqmlrender.cpp index f1bdd4d..79ae229 100644 --- a/src/runtimerender/q3dsqmlrender.cpp +++ b/src/runtimerender/q3dsqmlrender.cpp @@ -104,7 +104,7 @@ SOffscreenRenderFlags Q3DSQmlRender::NeedsRender(const SOffscreenRendererEnviron initializeRenderer(); if (m_qmlStreamRenderer) render = m_qmlStreamRenderer->isUpdateRequested(); - return SOffscreenRenderFlags(false, render); + return SOffscreenRenderFlags(true, render); } void Q3DSQmlRender::Render(const SOffscreenRendererEnvironment &inEnvironment, |