tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Depsgraph: Remove old header from blenkernel

This commit is contained in:
Sergey Sharybin 2017-04-06 16:11:50 +02:00
parent 2613ad64c5
commit 7b45edacab
33 changed files with 73 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/DerivedMesh.c
View File

@ -80,8 +80,8 @@ static DerivedMesh *navmesh_dm_createNavMeshForVisualization(DerivedMesh *dm);
#include "GPU_immediate.h"
#ifdef WITH_OPENSUBDIV
# include "BKE_depsgraph.h"
# include "DEG_depsgraph.h"
# include "DEG_depsgraph_query.h"
# include "DNA_userdef_types.h"
#endif
@ -2601,7 +2601,7 @@ static bool calc_modifiers_skip_orco(Scene *scene,
else if ((ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)) != 0) {
return false;
}
else if ((DAG_get_eval_flags_for_object(scene, ob) & DAG_EVAL_NEED_CPU) != 0) {
else if ((DEG_get_eval_flags_for_id(scene->depsgraph, &ob->id) & DAG_EVAL_NEED_CPU) != 0) {
return false;
}
SubsurfModifierData *smd = (SubsurfModifierData *)last_md;

5
source/blender/blenkernel/intern/action.c
View File

@ -55,7 +55,6 @@
#include "BKE_animsys.h"
#include "BKE_constraint.h"
#include "BKE_deform.h"
#include "BKE_depsgraph.h"
#include "BKE_fcurve.h"
#include "BKE_global.h"
#include "BKE_idprop.h"
@ -65,6 +64,8 @@
#include "BKE_main.h"
#include "BKE_object.h"
#include "DEG_depsgraph_build.h"
#include "BIK_api.h"
#include "RNA_access.h"
@ -1403,7 +1404,7 @@ void BKE_pose_tag_recalc(Main *bmain, bPose *pose)
/* Depsgraph components depends on actual pose state,
* if pose was changed depsgraph is to be updated as well.
*/
DAG_relations_tag_update(bmain);
DEG_relations_tag_update(bmain);
}
/* For the calculation of the effects of an Action at the given frame on an object

5
source/blender/blenkernel/intern/anim.c
View File

@ -44,7 +44,6 @@
#include "DNA_scene_types.h"
#include "BKE_curve.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h"
#include "BKE_key.h"
#include "BKE_main.h"
@ -54,6 +53,8 @@
#include "BKE_anim.h"
#include "BKE_report.h"
#include "DEG_depsgraph_build.h"
// XXX bad level call...
/* --------------------- */
@ -308,7 +309,7 @@ static void motionpaths_calc_optimise_depsgraph(Scene *scene, ListBase *targets)
}
/* "brew me a list that's sorted a bit faster now depsy" */
DAG_scene_relations_rebuild(G.main, scene);
DEG_scene_relations_rebuild(G.main, scene);
}
/* update scene for current frame */

5
source/blender/blenkernel/intern/anim_sys.c
View File

@ -60,7 +60,6 @@
#include "BKE_animsys.h"
#include "BKE_action.h"
#include "BKE_context.h"
#include "BKE_depsgraph.h"
#include "BKE_fcurve.h"
#include "BKE_nla.h"
#include "BKE_global.h"
@ -1663,7 +1662,7 @@ static bool animsys_write_rna_setting(PathResolvedRNA *anim_rna, const float val
* notify anyone of updates */
if (!(id->tag & LIB_TAG_ANIM_NO_RECALC)) {
BKE_id_tag_set_atomic(id, LIB_TAG_ID_RECALC);
DAG_id_type_tag(G.main, GS(id->name));
DEG_id_type_tag(G.main, GS(id->name));
}
}
@ -2618,7 +2617,7 @@ static void animsys_evaluate_nla(ListBase *echannels, PointerRNA *ptr, AnimData
ID *id = ptr->id.data;
if (!(id->tag & LIB_TAG_ANIM_NO_RECALC)) {
id->tag |= LIB_TAG_ID_RECALC;
DAG_id_type_tag(G.main, GS(id->name));
DEG_id_type_tag(G.main, GS(id->name));
}
}
}

1
source/blender/blenkernel/intern/armature.c
View File

@ -60,7 +60,6 @@
#include "BKE_anim.h"
#include "BKE_constraint.h"
#include "BKE_curve.h"
#include "BKE_depsgraph.h"
#include "BKE_DerivedMesh.h"
#include "BKE_deform.h"
#include "BKE_displist.h"

1
source/blender/blenkernel/intern/armature_update.c
View File

@ -41,7 +41,6 @@
#include "BKE_anim.h"
#include "BKE_armature.h"
#include "BKE_curve.h"
#include "BKE_depsgraph.h"
#include "BKE_displist.h"
#include "BKE_fcurve.h"
#include "BKE_scene.h"

5
source/blender/blenkernel/intern/blender.c
View File

@ -51,7 +51,6 @@
#include "BKE_brush.h"
#include "BKE_cachefile.h"
#include "BKE_context.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h"
#include "BKE_idprop.h"
#include "BKE_image.h"
@ -62,6 +61,8 @@
#include "BKE_screen.h"
#include "BKE_sequencer.h"
#include "DEG_depsgraph.h"
#include "RE_pipeline.h"
#include "RE_render_ext.h"
@ -87,7 +88,7 @@ void BKE_blender_free(void)
IMB_exit();
BKE_cachefiles_exit();
BKE_images_exit();
DAG_exit();
DEG_free_node_types();
BKE_brush_system_exit();
RE_texture_rng_exit();

5
source/blender/blenkernel/intern/blender_copybuffer.c
View File

@ -44,12 +44,13 @@
#include "BKE_blender_copybuffer.h" /* own include */
#include "BKE_blendfile.h"
#include "BKE_context.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h"
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_scene.h"
#include "DEG_depsgraph_build.h"
#include "BLO_readfile.h"
#include "BLO_writefile.h"
@ -157,7 +158,7 @@ bool BKE_copybuffer_paste(bContext *C, const char *libname, const short flag, Re
BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, false);
/* recreate dependency graph to include new objects */
DAG_relations_tag_update(bmain);
DEG_relations_tag_update(bmain);
BLO_blendhandle_close(bh);
/* remove library... */

5
source/blender/blenkernel/intern/blender_undo.c
View File

@ -56,7 +56,6 @@
#include "BKE_appdir.h"
#include "BKE_brush.h"
#include "BKE_context.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h"
#include "BKE_image.h"
#include "BKE_main.h"
@ -66,6 +65,8 @@
#include "BLO_readfile.h"
#include "BLO_writefile.h"
#include "DEG_depsgraph.h"
/* -------------------------------------------------------------------- */
/** \name Global Undo
@ -118,7 +119,7 @@ static int read_undosave(bContext *C, UndoElem *uel)
if (success) {
/* important not to update time here, else non keyed tranforms are lost */
DAG_on_visible_update(G.main, false);
DEG_on_visible_update(G.main, false);
}
return success;

3
source/blender/blenkernel/intern/curve.c
View File

@ -52,7 +52,6 @@
#include "BKE_animsys.h"
#include "BKE_curve.h"
#include "BKE_depsgraph.h"
#include "BKE_displist.h"
#include "BKE_font.h"
#include "BKE_global.h"
@ -4570,7 +4569,7 @@ int BKE_curve_material_index_validate(Curve *cu)
}
if (!is_valid) {
DAG_id_tag_update(&cu->id, OB_RECALC_DATA);
DEG_id_tag_update(&cu->id, OB_RECALC_DATA);
return true;
}
else {

4
source/blender/blenkernel/intern/displist.c
View File

@ -48,7 +48,6 @@
#include "BLI_utildefines.h"
#include "BKE_global.h"
#include "BKE_depsgraph.h"
#include "BKE_displist.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_object.h"
@ -64,6 +63,7 @@
#include "BLI_sys_types.h" // for intptr_t support
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_query.h"
static void boundbox_displist_object(Object *ob);
@ -1734,7 +1734,7 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
if (!for_orco) {
if ((cu->flag & CU_PATH) ||
DAG_get_eval_flags_for_object(scene, ob) & DAG_EVAL_NEED_CURVE_PATH)
DEG_get_eval_flags_for_id(scene->depsgraph, &ob->id) & DAG_EVAL_NEED_CURVE_PATH)
{
calc_curvepath(ob, &nubase);
}

2
source/blender/blenkernel/intern/group.c
View File

@ -45,8 +45,6 @@
#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h"
#include "BKE_group.h"
#include "BKE_icons.h"

1
source/blender/blenkernel/intern/lattice.c
View File

@ -53,7 +53,6 @@
#include "BKE_anim.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_curve.h"
#include "BKE_depsgraph.h"
#include "BKE_displist.h"
#include "BKE_global.h"
#include "BKE_key.h"

1
source/blender/blenkernel/intern/layer.c
View File

@ -33,7 +33,6 @@
#include "BLT_translation.h"
#include "BKE_collection.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h"
#include "BKE_idprop.h"
#include "BKE_layer.h"

7
source/blender/blenkernel/intern/library.c
View File

@ -91,7 +91,6 @@
#include "BKE_cachefile.h"
#include "BKE_context.h"
#include "BKE_curve.h"
#include "BKE_depsgraph.h"
#include "BKE_font.h"
#include "BKE_global.h"
#include "BKE_group.h"
@ -773,11 +772,11 @@ void BKE_main_lib_objects_recalc_all(Main *bmain)
/* flag for full recalc */
for (ob = bmain->object.first; ob; ob = ob->id.next) {
if (ID_IS_LINKED_DATABLOCK(ob)) {
DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
}
}
DAG_id_type_tag(bmain, ID_OB);
DEG_id_type_tag(bmain, ID_OB);
}
/**
@ -988,7 +987,7 @@ void *BKE_libblock_alloc(Main *bmain, short type, const char *name)
/* alphabetic insertion: is in new_id */
BKE_main_unlock(bmain);
}
DAG_id_type_tag(bmain, type);
DEG_id_type_tag(bmain, type);
return id;
}

10
source/blender/blenkernel/intern/library_remap.c
View File

@ -73,7 +73,6 @@
#include "BKE_cachefile.h"
#include "BKE_collection.h"
#include "BKE_curve.h"
#include "BKE_depsgraph.h"
#include "BKE_fcurve.h"
#include "BKE_font.h"
#include "BKE_group.h"
@ -109,6 +108,9 @@
#include "BKE_texture.h"
#include "BKE_world.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
#ifdef WITH_PYTHON
#include "BPY_extern.h"
#endif
@ -220,7 +222,7 @@ static int foreach_libblock_remap_callback(void *user_data, ID *id_self, ID **id
else {
if (!is_never_null) {
*id_p = new_id;
DAG_id_tag_update_ex(id_remap_data->bmain, id_self, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
DEG_id_tag_update_ex(id_remap_data->bmain, id_self, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
}
if (cb_flag & IDWALK_CB_USER) {
id_us_min(old_id);
@ -599,7 +601,7 @@ void BKE_libblock_remap_locked(
BKE_main_lock(bmain);
/* Full rebuild of DAG! */
DAG_relations_tag_update(bmain);
DEG_relations_tag_update(bmain);
}
void BKE_libblock_remap(Main *bmain, void *old_idv, void *new_idv, const short remap_flags)
@ -767,7 +769,7 @@ void BKE_libblock_free_ex(Main *bmain, void *idv, const bool do_id_user, const b
short type = GS(id->name);
ListBase *lb = which_libbase(bmain, type);
DAG_id_type_tag(bmain, type);
DEG_id_type_tag(bmain, type);
#ifdef WITH_PYTHON
BPY_id_release(id);

13
source/blender/blenkernel/intern/material.c
View File

@ -58,7 +58,6 @@
#include "BKE_animsys.h"
#include "BKE_displist.h"
#include "BKE_global.h"
#include "BKE_depsgraph.h"
#include "BKE_icons.h"
#include "BKE_image.h"
#include "BKE_library.h"
@ -73,6 +72,8 @@
#include "BKE_editmesh.h"
#include "BKE_font.h"
#include "DEG_depsgraph_build.h"
#include "GPU_material.h"
/* used in UI and render */
@ -430,7 +431,7 @@ void BKE_material_resize_id(Main *bmain, ID *id, short totcol, bool do_id_user)
}
*totcolp = totcol;
DAG_relations_tag_update(bmain);
DEG_relations_tag_update(bmain);
}
void BKE_material_append_id(Main *bmain, ID *id, Material *ma)
@ -447,7 +448,7 @@ void BKE_material_append_id(Main *bmain, ID *id, Material *ma)
id_us_plus((ID *)ma);
test_all_objects_materials(bmain, id);
DAG_relations_tag_update(bmain);
DEG_relations_tag_update(bmain);
}
}
@ -481,7 +482,7 @@ Material *BKE_material_pop_id(Main *bmain, ID *id, int index_i, bool update_data
material_data_index_remove_id(id, index);
}
DAG_relations_tag_update(bmain);
DEG_relations_tag_update(bmain);
}
}
@ -508,7 +509,7 @@ void BKE_material_clear_id(Main *bmain, ID *id, bool update_data)
material_data_index_clear_id(id);
}
DAG_relations_tag_update(bmain);
DEG_relations_tag_update(bmain);
}
}
@ -603,7 +604,7 @@ void BKE_material_resize_object(Main *bmain, Object *ob, const short totcol, boo
if (ob->totcol && ob->actcol == 0) ob->actcol = 1;
if (ob->actcol > ob->totcol) ob->actcol = ob->totcol;
DAG_relations_tag_update(bmain);
DEG_relations_tag_update(bmain);
}
void test_object_materials(Object *ob, ID *id)

1
source/blender/blenkernel/intern/mball.c
View File

@ -57,7 +57,6 @@
#include "BKE_animsys.h"
#include "BKE_curve.h"
#include "BKE_depsgraph.h"
#include "BKE_scene.h"
#include "BKE_library.h"
#include "BKE_library_query.h"

1
source/blender/blenkernel/intern/mball_tessellate.c
View File

@ -48,7 +48,6 @@
#include "BKE_global.h"
#include "BKE_depsgraph.h"
#include "BKE_scene.h"
#include "BKE_displist.h"
#include "BKE_mball_tessellate.h" /* own include */

1
source/blender/blenkernel/intern/mesh.c
View File

@ -60,7 +60,6 @@
#include "BKE_multires.h"
#include "BKE_key.h"
#include "BKE_mball.h"
#include "BKE_depsgraph.h"
/* these 2 are only used by conversion functions */
#include "BKE_curve.h"
/* -- */

1
source/blender/blenkernel/intern/mesh_render.c
View File

@ -39,7 +39,6 @@
#include "DNA_meshdata_types.h"
#include "BKE_customdata.h"
#include "BKE_depsgraph.h"
#include "BKE_DerivedMesh.h"
#include "BKE_editmesh.h"
#include "BKE_mesh.h"

7
source/blender/blenkernel/intern/mesh_validate.c
View File

@ -43,10 +43,11 @@
#include "BLI_math_vector.h"
#include "BKE_deform.h"
#include "BKE_depsgraph.h"
#include "BKE_DerivedMesh.h"
#include "BKE_mesh.h"
#include "DEG_depsgraph.h"
#include "MEM_guardedalloc.h"
/* loop v/e are unsigned, so using max uint_32 value as invalid marker... */
@ -1019,7 +1020,7 @@ int BKE_mesh_validate(Mesh *me, const int do_verbose, const int cddata_check_mas
&changed);
if (changed) {
DAG_id_tag_update(&me->id, OB_RECALC_DATA);
DEG_id_tag_update(&me->id, OB_RECALC_DATA);
return true;
}
else {
@ -1105,7 +1106,7 @@ int BKE_mesh_validate_material_indices(Mesh *me)
}
if (!is_valid) {
DAG_id_tag_update(&me->id, OB_RECALC_DATA);
DEG_id_tag_update(&me->id, OB_RECALC_DATA);
return true;
}
else {

9
source/blender/blenkernel/intern/object.c
View File

@ -78,7 +78,6 @@
#include "BKE_action.h"
#include "BKE_bullet.h"
#include "BKE_deform.h"
#include "BKE_depsgraph.h"
#include "BKE_DerivedMesh.h"
#include "BKE_animsys.h"
#include "BKE_anim.h"
@ -400,7 +399,7 @@ void BKE_object_free_caches(Object *object)
* guaranteed to be in a known state.
*/
if (update_flag != 0) {
DAG_id_tag_update(&object->id, update_flag);
DEG_id_tag_update(&object->id, update_flag);
}
}
@ -713,7 +712,7 @@ Object *BKE_object_add(
BKE_scene_layer_base_deselect_all(sl);
BKE_scene_layer_base_select(sl, base);
DAG_id_tag_update_ex(bmain, &ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
DEG_id_tag_update_ex(bmain, &ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
return ob;
}
@ -1340,8 +1339,8 @@ void BKE_object_make_proxy(Object *ob, Object *target, Object *gob)
ob->proxy_group = gob;
id_lib_extern(&target->id);
DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
DAG_id_tag_update(&target->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
DEG_id_tag_update(&target->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
/* copy transform
* - gob means this proxy comes from a group, just apply the matrix

1
source/blender/blenkernel/intern/object_dupli.c
View File

@ -49,7 +49,6 @@
#include "BKE_animsys.h"
#include "BKE_DerivedMesh.h"
#include "BKE_depsgraph.h"
#include "BKE_font.h"
#include "BKE_group.h"
#include "BKE_global.h"

1
source/blender/blenkernel/intern/object_update.c
View File

@ -43,7 +43,6 @@
#include "BKE_armature.h"
#include "BKE_action.h"
#include "BKE_constraint.h"
#include "BKE_depsgraph.h"
#include "BKE_DerivedMesh.h"
#include "BKE_animsys.h"
#include "BKE_displist.h"

5
source/blender/blenkernel/intern/paint.c
View File

@ -52,7 +52,6 @@
#include "BKE_main.h"
#include "BKE_context.h"
#include "BKE_crazyspace.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h"
#include "BKE_image.h"
#include "BKE_key.h"
@ -64,6 +63,8 @@
#include "BKE_pbvh.h"
#include "BKE_subsurf.h"
#include "DEG_depsgraph.h"
#include "bmesh.h"
const char PAINT_CURSOR_SCULPT[3] = {255, 100, 100};
@ -683,7 +684,7 @@ void BKE_sculptsession_bm_to_me(Object *ob, bool reorder)
sculptsession_bm_to_me_update_data_only(ob, reorder);
/* ensure the objects DerivedMesh mesh doesn't hold onto arrays now realloc'd in the mesh [#34473] */
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
}
}

12
source/blender/blenkernel/intern/particle.c
View File

@ -78,7 +78,6 @@
#include "BKE_library.h"
#include "BKE_library_query.h"
#include "BKE_library_remap.h"
#include "BKE_depsgraph.h"
#include "BKE_modifier.h"
#include "BKE_mesh.h"
#include "BKE_cdderivedmesh.h"
@ -86,6 +85,9 @@
#include "BKE_scene.h"
#include "BKE_deform.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
#include "RE_render_ext.h"
unsigned int PSYS_FRAND_SEED_OFFSET[PSYS_FRAND_COUNT];
@ -3153,8 +3155,8 @@ ModifierData *object_add_particle_system(Scene *scene, Object *ob, const char *n
psys->flag = PSYS_CURRENT;
psys->cfra = BKE_scene_frame_get_from_ctime(scene, CFRA + 1);
DAG_relations_tag_update(G.main);
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
DEG_relations_tag_update(G.main);
DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
return md;
}
@ -3199,8 +3201,8 @@ void object_remove_particle_system(Scene *UNUSED(scene), Object *ob)
else
ob->mode &= ~OB_MODE_PARTICLE_EDIT;
DAG_relations_tag_update(G.main);
DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
DEG_relations_tag_update(G.main);
DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
}
static void default_particle_settings(ParticleSettings *part)

1
source/blender/blenkernel/intern/particle_system.c
View File

@ -88,7 +88,6 @@
#include "BKE_modifier.h"
#include "BKE_scene.h"
#include "BKE_bvhutils.h"
#include "BKE_depsgraph.h"
#include "DEG_depsgraph.h"

1
source/blender/blenkernel/intern/rigidbody.c
View File

@ -55,7 +55,6 @@
#include "DNA_scene_types.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_depsgraph.h"
#include "BKE_effect.h"
#include "BKE_global.h"
#include "BKE_library.h"

29
source/blender/blenkernel/intern/scene.c
View File

@ -69,7 +69,6 @@
#include "BKE_cachefile.h"
#include "BKE_collection.h"
#include "BKE_colortools.h"
#include "BKE_depsgraph.h"
#include "BKE_editmesh.h"
#include "BKE_fcurve.h"
#include "BKE_freestyle.h"
@ -97,6 +96,8 @@
#include "BKE_world.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
#include "DEG_depsgraph_query.h"
#include "RE_engine.h"
@ -553,7 +554,7 @@ void BKE_scene_free(Scene *sce)
sce->toolsettings = NULL;
}
DAG_scene_free(sce);
DEG_scene_graph_free(sce);
if (sce->depsgraph)
DEG_graph_free(sce->depsgraph);
@ -1010,7 +1011,7 @@ void BKE_scene_set_background(Main *bmain, Scene *scene)
/* sort baselist for scene and sets */
for (sce = scene; sce; sce = sce->set)
DAG_scene_relations_rebuild(bmain, sce);
DEG_scene_relations_rebuild(bmain, sce);
/* copy layers and flags from bases to objects */
for (base = scene->base.first; base; base = base->next) {
@ -1398,7 +1399,7 @@ void BKE_scene_frame_set(struct Scene *scene, double cfra)
static void scene_armature_depsgraph_workaround(Main *bmain)
{
Object *ob;
if (BLI_listbase_is_empty(&bmain->armature) || !DAG_id_type_tagged(bmain, ID_OB)) {
if (BLI_listbase_is_empty(&bmain->armature) || !DEG_id_type_tagged(bmain, ID_OB)) {
return;
}
for (ob = bmain->object.first; ob; ob = ob->id.next) {
@ -1452,7 +1453,7 @@ static void prepare_mesh_for_viewport_render(Main *bmain, Scene *scene)
if (check_rendered_viewport_visible(bmain)) {
BMesh *bm = mesh->edit_btmesh->bm;
BM_mesh_bm_to_me(bm, mesh, (&(struct BMeshToMeshParams){0}));
DAG_id_tag_update(&mesh->id, 0);
DEG_id_tag_update(&mesh->id, 0);
}
}
}
@ -1467,10 +1468,10 @@ void BKE_scene_update_tagged(EvaluationContext *eval_ctx, Main *bmain, Scene *sc
/* (re-)build dependency graph if needed */
for (sce_iter = scene; sce_iter; sce_iter = sce_iter->set) {
DAG_scene_relations_update(bmain, sce_iter);
DEG_scene_relations_update(bmain, sce_iter);
/* Uncomment this to check if graph was properly tagged for update. */
#if 0
DAG_scene_relations_validate(bmain, sce_iter);
DEG_scene_relations_validate(bmain, sce_iter);
#endif
}
@ -1478,7 +1479,7 @@ void BKE_scene_update_tagged(EvaluationContext *eval_ctx, Main *bmain, Scene *sc
prepare_mesh_for_viewport_render(bmain, scene);
/* flush recalc flags to dependencies */
DAG_ids_flush_tagged(bmain);
DEG_ids_flush_tagged(bmain);
/* removed calls to quick_cache, see pointcache.c */
@ -1513,10 +1514,10 @@ void BKE_scene_update_tagged(EvaluationContext *eval_ctx, Main *bmain, Scene *sc
BLI_callback_exec(bmain, &scene->id, BLI_CB_EVT_SCENE_UPDATE_POST);
/* Inform editors about possible changes. */
DAG_ids_check_recalc(bmain, scene, false);
DEG_ids_check_recalc(bmain, scene, false);
/* clear recalc flags */
DAG_ids_clear_recalc(bmain);
DEG_ids_clear_recalc(bmain);
}
/* applies changes right away, does all sets too */
@ -1525,7 +1526,7 @@ void BKE_scene_update_for_newframe(EvaluationContext *eval_ctx, Main *bmain, Sce
float ctime = BKE_scene_frame_get(sce);
Scene *sce_iter;
DAG_editors_update_pre(bmain, sce, true);
DEG_editors_update_pre(bmain, sce, true);
/* keep this first */
BLI_callback_exec(bmain, &sce->id, BLI_CB_EVT_FRAME_CHANGE_PRE);
@ -1541,7 +1542,7 @@ void BKE_scene_update_for_newframe(EvaluationContext *eval_ctx, Main *bmain, Sce
/* XXX TODO... */
for (sce_iter = sce; sce_iter; sce_iter = sce_iter->set)
DAG_scene_relations_update(bmain, sce_iter);
DEG_scene_relations_update(bmain, sce_iter);
BKE_mask_evaluate_all_masks(bmain, ctime, true);
@ -1569,10 +1570,10 @@ void BKE_scene_update_for_newframe(EvaluationContext *eval_ctx, Main *bmain, Sce
BLI_callback_exec(bmain, &sce->id, BLI_CB_EVT_FRAME_CHANGE_POST);
/* Inform editors about possible changes. */
DAG_ids_check_recalc(bmain, sce, true);
DEG_ids_check_recalc(bmain, sce, true);
/* clear recalc flags */
DAG_ids_clear_recalc(bmain);
DEG_ids_clear_recalc(bmain);
}
/* return default layer, also used to patch old files */

1
source/blender/blenkernel/intern/sequencer.c
View File

@ -63,7 +63,6 @@
#include "BLT_translation.h"
#include "BKE_animsys.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h"
#include "BKE_image.h"
#include "BKE_layer.h"

1
source/blender/blenkernel/intern/text.c
View File

@ -58,7 +58,6 @@
#include "DNA_node_types.h"
#include "DNA_material_types.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h"
#include "BKE_library.h"
#include "BKE_main.h"

4
source/blender/depsgraph/DEG_depsgraph_build.h
View File

@ -161,7 +161,7 @@ typedef bool (*DEG_CollobjFilterFunction)(struct Object *obj, struct ModifierDat
void DEG_add_collision_relations(struct DepsNodeHandle *handle,
struct Scene *scene,
Object *ob,
struct Object *ob,
struct Group *group,
unsigned int modifier_type,
DEG_CollobjFilterFunction fn,
@ -169,7 +169,7 @@ void DEG_add_collision_relations(struct DepsNodeHandle *handle,
const char *name);
void DEG_add_forcefield_relations(struct DepsNodeHandle *handle,
struct Scene *scene,
Object *ob,
struct Object *ob,
struct EffectorWeights *eff,
bool add_absorption,
int skip_forcefield,