Tag object/scene for selection update from operators

Before that depsgraph tagging was done from inside notifier listener in
viewport. This had the following issues:

- If there are no viewports, selection tag was not done. Causing possible
  issues when object becomes visible.

- Required special trickery to detect which data to tag for update.

- Was causing crash when transforming/selecting markers in clip editor.
  This is because selecting marker needed to poke viewport to redraw, since
  selected bundles will be displayed differently in viewport.

2 files changed, 18 insertions, 14 deletions

diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 964f6f8ea4e..3c98bc6d863 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -820,7 +820,6 @@ static void view3d_main_region_listener(
 					break;
 				case ND_OB_ACTIVE:
 				case ND_OB_SELECT:
-					DEG_id_tag_update((ID *)&scene->id, DEG_TAG_SELECT_UPDATE);
 					ATTR_FALLTHROUGH;
 				case ND_FRAME:
 				case ND_TRANSFORM:
@@ -875,18 +874,6 @@ static void view3d_main_region_listener(
 				case ND_SELECT:
 				{
 					WM_manipulatormap_tag_refresh(mmap);
-
-					ID *ob_data = wmn->reference;
-					if (ob_data == NULL) {
-						BLI_assert(wmn->window); // Use `WM_event_add_notifier` instead of `WM_main_add_notifier`
-						ViewLayer *view_layer = WM_window_get_active_view_layer(wmn->window);
-						ob_data = OBEDIT_FROM_VIEW_LAYER(view_layer)->data;
-					}
-					if (ob_data) {
-						BLI_assert(OB_DATA_SUPPORT_ID(GS(ob_data->name)));
-						/* TODO(sergey): Notifiers shouldn't really be doing DEG tags. */
-						DEG_id_tag_update(ob_data, DEG_TAG_SELECT_UPDATE);
-					}
 					ATTR_FALLTHROUGH;
 				}
 				case ND_DATA:
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index f4e39c7a563..08c6a6c328f 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -855,6 +855,7 @@ static void view3d_lasso_select(
 		}
 		else {
 			do_lasso_select_objects(vc, mcords, moves, extend, select);
+			DEG_id_tag_update(&vc->scene->id, DEG_TAG_SELECT_UPDATE);
 			WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, vc->scene);
 		}
 	}
@@ -885,6 +886,7 @@ static void view3d_lasso_select(
 					break;
 			}
 
+			DEG_id_tag_update(vc->obedit->data, DEG_TAG_SELECT_UPDATE);
 			WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc->obedit->data);
 		}
 		FOREACH_OBJECT_IN_MODE_END;
@@ -1009,7 +1011,9 @@ static int object_select_menu_exec(bContext *C, wmOperator *op)
 
 	/* undo? */
 	if (changed) {
-		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, CTX_data_scene(C));
+		Scene *scene = CTX_data_scene(C);
+		DEG_id_tag_update(&scene->id, DEG_TAG_SELECT_UPDATE);
+		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
 		return OPERATOR_FINISHED;
 	}
 	else {
@@ -1562,6 +1566,7 @@ static bool ed_object_select_pick(
 
 								retval = true;
 
+								DEG_id_tag_update(&scene->id, DEG_TAG_SELECT_UPDATE);
 								WM_event_add_notifier(C, NC_MOVIECLIP | ND_SELECT, track);
 								WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
 
@@ -1658,6 +1663,7 @@ static bool ed_object_select_pick(
 			}
 		}
 
+		DEG_id_tag_update(&scene->id, DEG_TAG_SELECT_UPDATE);
 		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
 	}
 
@@ -2241,6 +2247,7 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, b
 
 		MEM_freeN(bases);
 
+		DEG_id_tag_update(&vc->scene->id, DEG_TAG_SELECT_UPDATE);
 		WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, vc->scene);
 	}
 	MEM_freeN(vbuffer);
@@ -2276,6 +2283,7 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
 					vc.em = BKE_editmesh_from_object(vc.obedit);
 					ret |= do_mesh_box_select(&vc, &rect, select, extend);
 					if (ret & OPERATOR_FINISHED) {
+						DEG_id_tag_update(vc.obedit->data, DEG_TAG_SELECT_UPDATE);
 						WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
 					}
 					break;
@@ -2283,24 +2291,28 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
 				case OB_SURF:
 					ret |= do_nurbs_box_select(&vc, &rect, select, extend);
 					if (ret & OPERATOR_FINISHED) {
+						DEG_id_tag_update(vc.obedit->data, DEG_TAG_SELECT_UPDATE);
 						WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
 					}
 					break;
 				case OB_MBALL:
 					ret |= do_meta_box_select(&vc, &rect, select, extend);
 					if (ret & OPERATOR_FINISHED) {
+						DEG_id_tag_update(vc.obedit->data, DEG_TAG_SELECT_UPDATE);
 						WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
 					}
 					break;
 				case OB_ARMATURE:
 					ret |= do_armature_box_select(&vc, &rect, select, extend);
 					if (ret & OPERATOR_FINISHED) {
+						DEG_id_tag_update(&vc.obedit->id, DEG_TAG_SELECT_UPDATE);
 						WM_event_add_notifier(C, NC_OBJECT | ND_BONE_SELECT, vc.obedit);
 					}
 					break;
 				case OB_LATTICE:
 					ret |= do_lattice_box_select(&vc, &rect, select, extend);
 					if (ret & OPERATOR_FINISHED) {
+						DEG_id_tag_update(vc.obedit->data, DEG_TAG_SELECT_UPDATE);
 						WM_event_add_notifier(C, NC_GEOM | ND_SELECT, vc.obedit->data);
 					}
 					break;
@@ -2403,6 +2415,7 @@ static bool ed_wpaint_vertex_select_pick(
 		}
 
 		paintvert_flush_flags(obact);
+		DEG_id_tag_update(obact->data, DEG_TAG_SELECT_UPDATE);
 		WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obact->data);
 		return true;
 	}
@@ -3004,14 +3017,17 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op)
 
 			if (CTX_data_edit_object(C)) {
 				obedit_circle_select(&vc, select, mval, (float)radius);
+				DEG_id_tag_update(obact->data, DEG_TAG_SELECT_UPDATE);
 				WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obact->data);
 			}
 			else if (BKE_paint_select_face_test(obact)) {
 				paint_facesel_circle_select(&vc, select, mval, (float)radius);
+				DEG_id_tag_update(obact->data, DEG_TAG_SELECT_UPDATE);
 				WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obact->data);
 			}
 			else if (BKE_paint_select_vert_test(obact)) {
 				paint_vertsel_circle_select(&vc, select, mval, (float)radius);
+				DEG_id_tag_update(obact->data, DEG_TAG_SELECT_UPDATE);
 				WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obact->data);
 			}
 			else if (obact->mode & OB_MODE_POSE) {
@@ -3028,6 +3044,7 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op)
 	}
 	else {
 		if (object_circle_select(&vc, select, mval, (float)radius)) {
+			DEG_id_tag_update(&vc.scene->id, DEG_TAG_SELECT_UPDATE);
 			WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, vc.scene);
 		}
 	}