summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2018-09-24 17:48:11 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2018-09-25 06:57:50 +0000
commit6aee409c05fc8fb6efe816f971299f0973cf59cb (patch)
tree59d835c2094f7d0eb6f95401666fd94f26148b22
parent2d016b4c01e2a05543a46acd077fd98e7c568cc5 (diff)
Ensure widget layer is reset at frame clear
When preview window is shown in perspective view and selection widget is also shown, things can get into a state where reset is not properly called for the layer that contains the widgets. Task-number: QT3DS-2387 Change-Id: I268003dcdbd22aa511f5b9f7c893b01cc0b26618 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
index 4491ff09..bd824cb4 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/RendererImpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
@@ -307,6 +307,9 @@ namespace render {
if (!m_Layer.m_Flags.IsActive())
return;
+ // Ensure we clear the widget layer always
+ m_Renderer.LayerNeedsFrameClear(*static_cast<SLayerRenderData *>(this));
+
if (m_IRenderWidgets.size() < MAX_LAYER_WIDGETS)
m_IRenderWidgets.push_back(&inWidget);
}