Fix picking on child entities

Picking was broken for child entities of an entity having an object
picker. This commit addresses it. It was due to in practice always
testing the entities with object picker and not their children since
when verifying the presence of an object picker the information of the
original entity tested was lost.

Change-Id: Icce29b2bf4424ae8c51a8b4fc26cbe9b9b0041e5
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/render/jobs/pickboundingvolumeutils.cpp b/src/render/jobs/pickboundingvolumeutils.cpp
index c9f14490a..fd4eded27 100644
--- a/src/render/jobs/pickboundingvolumeutils.cpp
+++ b/src/render/jobs/pickboundingvolumeutils.cpp
@@ -174,10 +174,11 @@ AbstractCollisionGathererFunctor::result_type AbstractCollisionGathererFunctor::
 
     // If the Entity which actually received the hit doesn't have
     // an object picker component, we need to check the parent if it has one ...
-    while (objectPickerHandle.isNull() && entity != nullptr) {
-        entity = entity->parent();
-        if (entity != nullptr)
-            objectPickerHandle = entity->componentHandle<ObjectPicker, 16>();
+    auto parentEntity = entity;
+    while (objectPickerHandle.isNull() && parentEntity != nullptr) {
+        parentEntity = parentEntity->parent();
+        if (parentEntity != nullptr)
+            objectPickerHandle = parentEntity->componentHandle<ObjectPicker, 16>();
     }
 
     ObjectPicker *objectPicker = m_manager->objectPickerManager()->data(objectPickerHandle);