[Bf-blender-cvs] [7da23791248] blender2.8: Depsgraph: Remove old depsgraph header from blenloader

[Sergey Sharybin]

Commit: 7da23791248fee71a62ae0343610cd5956e77fd2
Author: Sergey Sharybin
Date:   Thu Apr 6 16:13:57 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB7da23791248fee71a62ae0343610cd5956e77fd2

Depsgraph: Remove old depsgraph header from blenloader

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

M	source/blender/blenloader/CMakeLists.txt
M	source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index d77c7388929..0a678cfe6f8 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -29,6 +29,7 @@ set(INC
 	../blenkernel
 	../blenlib
 	../blentranslation
+	../depsgraph
 	../imbuf
 	../makesdna
 	../makesrna
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 5f6663f4cc7..08f2c56e0ad 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -121,7 +121,6 @@
 #include "BKE_constraint.h"
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_effect.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h" // for G
@@ -150,6 +149,8 @@
 #include "BKE_sound.h"
 #include "BKE_colortools.h"
 
+#include "DEG_depsgraph.h"
+
 #include "NOD_common.h"
 #include "NOD_socket.h"
 
@@ -3309,7 +3310,7 @@ static void lib_link_pose(FileData *fd, Main *bmain, Object *ob, bPose *pose)
 	
 
 	if (rebuild) {
-		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);
 		BKE_pose_tag_recalc(bmain, pose);
 	}
 }
@@ -10034,7 +10035,7 @@ static void give_base_to_groups(
 			base = BKE_scene_base_add(scene, ob);
 			base->flag_legacy |= SELECT;
 			BKE_scene_base_flag_sync_from_base(base);
-			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);
 			scene->basact = base;
 
 			/* assign the group */