summaryrefslogtreecommitdiffstats
path: root/src/render/backend
diff options
context:
space:
mode:
authorKevin Ottens <kevin.ottens@kdab.com>2015-12-14 18:33:39 +0100
committerKevin Ottens <kevin.ottens@kdab.com>2015-12-16 13:54:27 +0000
commitedb8095b8c9a9d86f6b6abccf5d4d821470a5154 (patch)
tree368e6868ed34a166d96e3e31c36be4070c31f808 /src/render/backend
parentc10370585b6228c3564a22f22ec60ee24c9fe9f1 (diff)
Change the idiom to clear null job dependencies
The "clearNull" method is kind of surprising so make QAspectJob API more usual. Also the "clearNull" method was only used twice so change the idiom to go through removeDependency if that one receives a null pointer. Change-Id: Ib74e1054ba52754b1a19d6c3e9268fa9ff14edaf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend')
-rw-r--r--src/render/backend/renderer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index c64d811cd..5fdd6e136 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -748,7 +748,7 @@ QAspectJobPtr Renderer::pickBoundingVolumeJob()
// Clear any previous dependency not valid anymore
if (!m_pickBoundingVolumeJob)
m_pickBoundingVolumeJob.reset(new PickBoundingVolumeJob(this));
- m_pickBoundingVolumeJob->clearNullDependencies();
+ m_pickBoundingVolumeJob->removeDependency(QWeakPointer<QAspectJob>());
m_pickBoundingVolumeJob->setRoot(m_renderSceneRoot);
return m_pickBoundingVolumeJob;
}