[Bf-blender-cvs] [a96e97a83ff] blender2.8: Depsgraph: Move away from setting old deprecated object recalc flags

[Sergey Sharybin]

Commit: a96e97a83ff5b8ea94e9d768f53ae02c6d51d64f
Author: Sergey Sharybin
Date:   Fri Dec 1 12:14:55 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBa96e97a83ff5b8ea94e9d768f53ae02c6d51d64f

Depsgraph: Move away from setting old deprecated object recalc flags

Those shouldn't be used anywhere for real now.

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

M	source/blender/depsgraph/intern/builder/deg_builder.cc
M	source/blender/depsgraph/intern/depsgraph_tag.cc
M	source/blender/depsgraph/intern/eval/deg_eval_flush.cc

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc
index d6a054f2ee9..20a93673350 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder.cc
@@ -55,12 +55,6 @@ void deg_graph_build_finalize(Main *bmain, Depsgraph *graph)
 		if ((id->tag & LIB_TAG_ID_RECALC_ALL)) {
 			id_node->tag_update(graph);
 		}
-		else if (GS(id->name) == ID_OB) {
-			Object *object = (Object *)id;
-			if (object->recalc & OB_RECALC_ALL) {
-				id_node->tag_update(graph);
-			}
-		}
 		/* TODO(sergey): This is not ideal at all, since this forces
 		 * re-evaluaiton of the whole tree.
 		 */
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index dd8b643d1c3..e928da58e87 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -111,11 +111,6 @@ void lib_id_recalc_tag_flag(Main *bmain, ID *id, int flag)
 	 * after relations update and after layer visibility changes.
 	 */
 	if (flag) {
-		ID_Type id_type = GS(id->name);
-		if (id_type == ID_OB) {
-			Object *object = (Object *)id;
-			object->recalc |= (flag & OB_RECALC_ALL);
-		}
 		if (flag & OB_RECALC_OB) {
 			lib_id_recalc_tag(bmain, id);
 		}
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index e7d5a13d81f..c336c1dd60f 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -163,9 +163,7 @@ void deg_graph_flush_updates(Main *bmain, Depsgraph *graph)
 					cow_comp->tag_update(graph);
 				}
 
-				Object *object = NULL;
 				if (GS(id_orig->name) == ID_OB) {
-					object = (Object *)id_orig;
 					if (id_node->done == 0) {
 						++num_flushed_objects;
 					}
@@ -181,46 +179,6 @@ void deg_graph_flush_updates(Main *bmain, Depsgraph *graph)
 					}
 					op->flag |= DEPSOP_FLAG_NEEDS_UPDATE;
 				}
-				if (object != NULL) {
-					/* This code is used to preserve those areas which does
-					 * direct object update,
-					 *
-					 * Plus it ensures visibility changes and relations and
-					 * layers visibility update has proper flags to work with.
-					 */
-					switch (comp_node->type) {
-						case DEG_NODE_TYPE_UNDEFINED:
-						case DEG_NODE_TYPE_OPERATION:
-						case DEG_NODE_TYPE_TIMESOURCE:
-						case DEG_NODE_TYPE_ID_REF:
-						case DEG_NODE_TYPE_SEQUENCER:
-							/* Ignore, does not translate to object component. */
-							BLI_assert(!"This should never happen!");
-							break;
-						case DEG_NODE_TYPE_ANIMATION:
-							object->recalc |= OB_RECALC_TIME;
-							break;
-						case DEG_NODE_TYPE_TRANSFORM:
-							object->recalc |= OB_RECALC_OB;
-							break;
-						case DEG_NODE_TYPE_GEOMETRY:
-						case DEG_NODE_TYPE_EVAL_POSE:
-						case DEG_NODE_TYPE_BONE:
-						case DEG_NODE_TYPE_EVAL_PARTICLES:
-						case DEG_NODE_TYPE_SHADING:
-						case DEG_NODE_TYPE_CACHE:
-						case DEG_NODE_TYPE_PROXY:
-							object->recalc |= OB_RECALC_DATA;
-							break;
-						case DEG_NODE_TYPE_BATCH_CACHE:
-						case DEG_NODE_TYPE_COPY_ON_WRITE:
-						case DEG_NODE_TYPE_LAYER_COLLECTIONS:
-						case DEG_NODE_TYPE_PARAMETERS:
-						case DEG_NODE_TYPE_SHADING_PARAMETERS:
-							/* Ignore, does not translate to recalc flags. */
-							break;
-					}
-				}
 				/* When some target changes bone, we might need to re-run the
 				 * whole IK solver, otherwise result might be unpredictable.
 				 */