DepsGraph: Multi ViewLayer Selection

When using multiple viewlayers and switching between them the selection
gets buggy. The reason for this is that the select_id is updated based
on the index in the viewlayer. This makes the select_id not unique as
objects might be shared or not shared at all.

This fix will update the select_id on all objects in main. This will be triggered in all the selection operators.

Reviewed By: sergey, brecht

Maniphest Tasks: T55617

Differential Revision: https://developer.blender.org/D4824

1 files changed, 7 insertions, 2 deletions

diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index a94d47496e0..6361ff63fd4 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -37,6 +37,8 @@
 
 #include "BKE_armature.h"
 
+#include "DEG_depsgraph_query.h"
+
 #include "ED_armature.h"
 
 #include "UI_resources.h"
@@ -1848,7 +1850,9 @@ static void draw_armature_edit(Object *ob)
   const bool show_text = DRW_state_show_text();
   const bool show_relations = ((draw_ctx->v3d->flag & V3D_HIDE_HELPLINES) == 0);
 
-  for (eBone = arm->edbo->first, index = ob->select_id; eBone;
+  const Object *orig_object = DEG_get_original_object(ob);
+
+  for (eBone = arm->edbo->first, index = orig_object->runtime.select_id; eBone;
        eBone = eBone->next, index += 0x10000) {
     if (eBone->layer & arm->layer) {
       if ((eBone->flag & BONE_HIDDEN_A) == 0) {
@@ -1943,7 +1947,8 @@ static void draw_armature_pose(Object *ob, const float const_color[4])
     }
 
     if (arm->flag & ARM_POSEMODE) {
-      index = ob->select_id;
+      const Object *orig_object = DEG_get_original_object(ob);
+      index = orig_object->runtime.select_id;
     }
   }