blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 753 Projects 19 Wiki Activity

Depsgraph: Move away from setting old deprecated object recalc flags 

Those shouldn't be used anywhere for real now.
This commit is contained in:
Sergey Sharybin 2017-12-01 12:14:55 +01:00
parent 9bbffd4e02
commit a96e97a83f
3 changed files with 0 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/depsgraph/intern/builder/deg_builder.cc
View File

@ -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.
*/

5
source/blender/depsgraph/intern/depsgraph_tag.cc
View File

@ -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);
}

42
source/blender/depsgraph/intern/eval/deg_eval_flush.cc
View File

@ -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.
*/