1 files changed, 7 insertions, 77 deletions

diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index cfc9005a1e3..e960200a4cc 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -74,7 +74,9 @@ extern "C" {
  * design of those areas is more clear we'll do the same legacy code here.
  *                                                                  - sergey -
  */
+#if 0
 #define DEPSGRAPH_USE_LEGACY_TAGGING
+#endif
 
 namespace {
 
@@ -288,85 +290,13 @@ void DEG_ids_flush_tagged(Main *bmain)
 /* Update dependency graph when visible scenes/layers changes. */
 void DEG_graph_on_visible_update(Main *bmain, Scene *scene)
 {
+	(void) bmain;
 	DEG::Depsgraph *graph = reinterpret_cast<DEG::Depsgraph *>(scene->depsgraph);
-	wmWindowManager *wm = (wmWindowManager *)bmain->wm.first;
-	int old_layers = graph->layers;
-	if (wm != NULL) {
-		BKE_main_id_tag_listbase(&bmain->scene, LIB_TAG_DOIT, true);
-		graph->layers = 0;
-		for (wmWindow *win = (wmWindow *)wm->windows.first;
-		     win != NULL;
-		     win = (wmWindow *)win->next)
-		{
-			Scene *scene = win->screen->scene;
-			if (scene->id.tag & LIB_TAG_DOIT) {
-				graph->layers |= BKE_screen_visible_layers(win->screen, scene);
-				scene->id.tag &= ~LIB_TAG_DOIT;
-			}
-		}
-	}
-	else {
-		/* All the layers for background render for now. */
-		graph->layers = (1 << 20) - 1;
-	}
-	if (old_layers != graph->layers) {
-		/* Tag all objects which becomes visible (or which becomes needed for dependencies)
-		 * for recalc.
-		 *
-		 * This is mainly needed on file load only, after that updates of invisible objects
-		 * will be stored in the pending list.
-		 */
-		GHASH_FOREACH_BEGIN(DEG::IDDepsNode *, id_node, graph->id_hash)
-		{
-			ID *id = id_node->id;
-			if ((id->tag & LIB_TAG_ID_RECALC_ALL) != 0 ||
-			    (id_node->layers & scene->lay_updated) == 0)
-			{
-				id_node->tag_update(graph);
-			}
-			/* A bit of magic: if object->recalc is set it means somebody tagged
-			 * it for update. If corresponding ID recalc flags are zero it means
-			 * graph has been evaluated after that and the recalc was skipped
-			 * because of visibility check.
-			 */
-			if (GS(id->name) == ID_OB) {
-				Object *object = (Object *)id;
-				if ((id->tag & LIB_TAG_ID_RECALC_ALL) == 0 &&
-				    (object->recalc & OB_RECALC_ALL) != 0)
-				{
-					id_node->tag_update(graph);
-					DEG::ComponentDepsNode *anim_comp =
-					        id_node->find_component(DEG::DEPSNODE_TYPE_ANIMATION);
-					if (anim_comp != NULL && object->recalc & OB_RECALC_TIME) {
-						anim_comp->tag_update(graph);
-					}
-				}
-			}
-		}
-		GHASH_FOREACH_END();
-	}
-	scene->lay_updated |= graph->layers;
-	/* Special trick to get local view to work.  */
-	LINKLIST_FOREACH (Base *, base, &scene->base) {
-		Object *object = base->object;
-		DEG::IDDepsNode *id_node = graph->find_id_node(&object->id);
-		id_node->layers = 0;
-	}
-	LINKLIST_FOREACH (Base *, base, &scene->base) {
-		Object *object = base->object;
-		DEG::IDDepsNode *id_node = graph->find_id_node(&object->id);
-		id_node->layers |= base->lay;
-	}
-	DEG::deg_graph_build_flush_layers(graph);
-	LINKLIST_FOREACH (Base *, base, &scene->base) {
-		Object *object = base->object;
-		DEG::IDDepsNode *id_node = graph->find_id_node(&object->id);
-		GHASH_FOREACH_BEGIN(DEG::ComponentDepsNode *, comp, id_node->components)
-		{
-			id_node->layers |= comp->layers;
-		}
-		GHASH_FOREACH_END();
+	GHASH_FOREACH_BEGIN(DEG::IDDepsNode *, id_node, graph->id_hash)
+	{
+		id_node->tag_update(graph);
 	}
+	GHASH_FOREACH_END();
 }
 
 void DEG_on_visible_update(Main *bmain, const bool UNUSED(do_time))