diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-02-15 21:35:35 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-02-15 21:38:51 +0300 |
| commit | 9a0fb589f70ce20618291b30ec45b230f8ff234d (patch) | |
| tree | ee6f5c246ac7c911aedb072eaa1a5546d81e2994 /source/blender/blenkernel/intern/depsgraph.c | |
| parent | a1495366af1d53382e6f01e4c75c39dcd137217e (diff) | |
Cleanup: reorganize BKE ID tagging functions.
BKE_main_id_tag_/BKE_main_id_flag_ were horrible naming now that we split those
into flags (for presistent one) and tags (for runtime ones).
Got rid of previous 'tag_' functions behavior (those who were dedicated shortcuts
to set/clear LIB_TAG_DOIT), so now '_tag_' functions affect tags, and '_flag_'
functions affect flags.
Diffstat (limited to 'source/blender/blenkernel/intern/depsgraph.c')
| -rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index 8bd8b4ff94a..55c54cdac49 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -938,9 +938,9 @@ DagForest *build_dag(Main *bmain, Scene *sce, short mask) dag->need_update = false; /* clear "LIB_TAG_DOIT" flag from all materials, to prevent infinite recursion problems later [#32017] */ - BKE_main_id_tag_idcode(bmain, ID_MA, false); - BKE_main_id_tag_idcode(bmain, ID_LA, false); - BKE_main_id_tag_idcode(bmain, ID_GR, false); + BKE_main_id_tag_idcode(bmain, ID_MA, LIB_TAG_DOIT, false); + BKE_main_id_tag_idcode(bmain, ID_LA, LIB_TAG_DOIT, false); + BKE_main_id_tag_idcode(bmain, ID_GR, LIB_TAG_DOIT, false); /* add base node for scene. scene is always the first node in DAG */ scenenode = dag_add_node(dag, sce); @@ -956,7 +956,7 @@ DagForest *build_dag(Main *bmain, Scene *sce, short mask) build_dag_group(dag, scenenode, bmain, sce, ob->dup_group, mask); } - BKE_main_id_tag_idcode(bmain, ID_GR, false); + BKE_main_id_tag_idcode(bmain, ID_GR, LIB_TAG_DOIT, false); /* Now all relations were built, but we need to solve 1 exceptional case; * When objects have multiple "parents" (for example parent + constraint working on same object) @@ -2297,7 +2297,7 @@ void DAG_scene_update_flags(Main *bmain, Scene *scene, unsigned int lay, const b GroupObject *go; Scene *sce_iter; - BKE_main_id_tag_idcode(bmain, ID_GR, false); + BKE_main_id_tag_idcode(bmain, ID_GR, LIB_TAG_DOIT, false); /* set ob flags where animated systems are */ for (SETLOOPER(scene, sce_iter, base)) { @@ -2476,7 +2476,7 @@ void DAG_on_visible_update(Main *bmain, const bool do_time) for (sce_iter = scene; sce_iter; sce_iter = sce_iter->set) dag_scene_flush_layers(sce_iter, lay); - BKE_main_id_tag_idcode(bmain, ID_GR, false); + BKE_main_id_tag_idcode(bmain, ID_GR, LIB_TAG_DOIT, false); for (SETLOOPER(scene, sce_iter, base)) { ob = base->object; @@ -2507,7 +2507,7 @@ void DAG_on_visible_update(Main *bmain, const bool do_time) } } - BKE_main_id_tag_idcode(bmain, ID_GR, false); + BKE_main_id_tag_idcode(bmain, ID_GR, LIB_TAG_DOIT, false); /* now tag update flags, to ensure deformers get calculated on redraw */ DAG_scene_update_flags(bmain, scene, lay, do_time, true); |