diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2016-07-27 12:17:35 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2016-07-27 11:01:24 +0000 |
| commit | c809e56591862a874a347745e829a05e9036130a (patch) | |
| tree | 6563ff1b926dafca5742a37771fc1ae01fdeed78 /src/quick/scenegraph/adaptations | |
| parent | 6129f48e4ad4dd7341eafaa1212855556b5ee787 (diff) | |
Software Adaptation: Fix issue with clip node handling
Under certain circumstances the clip node state would not get
propagated properly to child nodes.
Change-Id: I6f34690c7cc6f2837854fbcaff9aa4d7522e47c3
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/quick/scenegraph/adaptations')
| -rw-r--r-- | src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenodeupdater.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenodeupdater.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenodeupdater.cpp index 82f8623b74..12dbf63353 100644 --- a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenodeupdater.cpp +++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderablenodeupdater.cpp @@ -218,12 +218,13 @@ void QSGSoftwareRenderableNodeUpdater::updateNodes(QSGNode *node, bool isNodeRem m_opacityState.push(state.opacity); m_transformState.push(state.transform); m_clipState.push(state.clip); - + m_hasClip = state.hasClip; } else { // There is no parent, and no previous parent, so likely a root node m_opacityState.push(1.0f); m_transformState.push(QTransform()); m_clipState.push(QRegion()); + m_hasClip = false; } // If the node is being removed, then cleanup the state data |