summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Määttä <antti.maatta@qt.io>2019-06-20 15:51:52 +0300
committerAntti Määttä <antti.maatta@qt.io>2019-06-20 16:50:44 +0300
commit696ff2d5e0d96420889cd61aa1e21dd23d51b6ac (patch)
tree6752f22856ead384e941709fd3b094362440d056
parentaca6fc7406608f4ba57f96de7655e6cbb13d1eb8 (diff)
Fix editor mattecolor after matteEnabled changev2.4.0-rc
The matte is always enabled in the editor Task-number: QT3DS-3542 Change-Id: Ic148fb664aa9f8f213d26a75f7860374d981a334 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io>
-rw-r--r--src/Authoring/Qt3DStudio/Render/StudioRendererTranslation.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Authoring/Qt3DStudio/Render/StudioRendererTranslation.cpp b/src/Authoring/Qt3DStudio/Render/StudioRendererTranslation.cpp
index 82678986..13413793 100644
--- a/src/Authoring/Qt3DStudio/Render/StudioRendererTranslation.cpp
+++ b/src/Authoring/Qt3DStudio/Render/StudioRendererTranslation.cpp
@@ -2167,6 +2167,7 @@ void STranslation::PreRender(bool scenePreviewPass)
CStudioPreferences::matteColor().greenF(),
CStudioPreferences::matteColor().blueF(), 1.0f);
m_Context.SetMatteColor(matteColor);
+ m_Context.setMatteEnabled(true);
// Ensure the camera points where it should
if (m_EditCameraEnabled && !scenePreviewPass) {
m_EditCameraInfo.ApplyToCamera(m_EditCamera, theViewportDims);