[Bf-blender-cvs] [ce08a2bd48b] geometry-nodes: Merge: fix after merge

[Jacques Lucke]

Commit: ce08a2bd48ba9ed1176720dd502f8a94a1054c92
Author: Jacques Lucke
Date:   Tue Nov 24 18:12:29 2020 +0100
Branches: geometry-nodes
https://developer.blender.org/rBce08a2bd48ba9ed1176720dd502f8a94a1054c92

Merge: fix after merge

This was part of rBe922dd7d8a307c54d49bc01649a12610b022192b.

===================================================================

M	source/blender/depsgraph/intern/depsgraph_query_iter.cc

===================================================================

diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index 68d7fbee4f2..b92bf475f49 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -310,6 +310,7 @@ bool deg_iterator_objects_step(DEGObjectIterData *data)
       }
     }
 
+    object->runtime.select_id = DEG_get_original_object(object)->runtime.select_id;
     if (ob_visibility & OB_VISIBLE_INSTANCES) {
       deg_iterator_duplis_init(data, object);
     }