diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-05-22 07:48:30 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-05-22 07:48:54 +0200 |
commit | 800025fb70ace453275011c1ae5ce906e0fa3344 (patch) | |
tree | 7f1ff56262b75beb3b0a1e94563c43fc59de742b /src/quick/util/qquickanimatorjob.cpp | |
parent | 666f20523cd7be16d88d3c03252ed2fd6e4be0c4 (diff) | |
parent | eb0f98499485487f9f75b6388f00c58b50aeff50 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0dd91626837276f5811e4830f4a4e9f89bf1e1bd
Diffstat (limited to 'src/quick/util/qquickanimatorjob.cpp')
-rw-r--r-- | src/quick/util/qquickanimatorjob.cpp | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp index 3bc4cef5b9..0bf95a49b4 100644 --- a/src/quick/util/qquickanimatorjob.cpp +++ b/src/quick/util/qquickanimatorjob.cpp @@ -281,6 +281,12 @@ void QQuickTransformAnimatorJob::initialize(QQuickAnimatorController *controller } } +void QQuickTransformAnimatorJob::nodeWasDestroyed() +{ + if (m_helper) + m_helper->node = 0; +} + void QQuickTransformAnimatorJob::Helper::sync() { const quint32 mask = QQuickItemPrivate::Position @@ -326,7 +332,7 @@ void QQuickTransformAnimatorJob::Helper::sync() void QQuickTransformAnimatorJob::Helper::apply() { - if (!wasChanged) + if (!wasChanged || !node) return; QMatrix4x4 m; @@ -412,6 +418,11 @@ void QQuickOpacityAnimatorJob::initialize(QQuickAnimatorController *controller) } } +void QQuickOpacityAnimatorJob::nodeWasDestroyed() +{ + m_opacityNode = 0; +} + void QQuickOpacityAnimatorJob::writeBack() { if (m_target) @@ -420,7 +431,7 @@ void QQuickOpacityAnimatorJob::writeBack() void QQuickOpacityAnimatorJob::updateCurrentTime(int time) { - if (!m_controller) + if (!m_controller || !m_opacityNode) return; Q_ASSERT(m_controller->m_window->openglContext()->thread() == QThread::currentThread()); @@ -504,13 +515,18 @@ void QQuickUniformAnimatorJob::setTarget(QQuickItem *target) m_target = target; } +void QQuickUniformAnimatorJob::nodeWasDestroyed() +{ + m_node = 0; + m_uniformIndex = -1; + m_uniformType = -1; +} + void QQuickUniformAnimatorJob::afterNodeSync() { m_node = static_cast<QQuickShaderEffectNode *>(QQuickItemPrivate::get(m_target)->paintNode); - if (m_node) { - m_uniformIndex = -1; - m_uniformType = -1; + if (m_node && m_uniformIndex == -1 && m_uniformType == -1) { QQuickShaderEffectMaterial *material = static_cast<QQuickShaderEffectMaterial *>(m_node->material()); bool found = false; |