Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h

This removes BKE_depsgraph.h and depsgraph.c

5 files changed, 22 insertions, 15 deletions

diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index c57f8d5c7a8..748849f1aa5 100644
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -24,6 +24,7 @@ set(INC
 	../../blenkernel
 	../../blenlib
 	../../blentranslation
+	../../depsgraph
 	../../gpu
 	../../imbuf
 	../../makesdna
diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c
index a04360b3395..812f4ef0747 100644
--- a/source/blender/editors/interface/interface_anim.c
+++ b/source/blender/editors/interface/interface_anim.c
@@ -39,11 +39,12 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_nla.h"
 
+#include "DEG_depsgraph_build.h"
+
 #include "ED_keyframing.h"
 
 #include "UI_interface.h"
@@ -211,7 +212,7 @@ bool ui_but_anim_expression_create(uiBut *but, const char *str)
 
 			/* updates */
 			driver->flag |= DRIVER_FLAG_RECOMPILE;
-			DAG_relations_tag_update(CTX_data_main(C));
+			DEG_relations_tag_update(CTX_data_main(C));
 			WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME, NULL);
 			ok = true;
 		}
diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c
index 858c21dfdda..a1ba937d925 100644
--- a/source/blender/editors/interface/interface_eyedropper.c
+++ b/source/blender/editors/interface/interface_eyedropper.c
@@ -43,10 +43,12 @@
 #include "BKE_screen.h"
 #include "BKE_report.h"
 #include "BKE_animsys.h"
-#include "BKE_depsgraph.h"
 #include "BKE_idcode.h"
 #include "BKE_unit.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -1205,8 +1207,8 @@ static void driverdropper_sample(bContext *C, wmOperator *op, const wmEvent *eve
 			if (success) {
 				/* send updates */
 				UI_context_update_anim_flag(C);
-				DAG_relations_tag_update(CTX_data_main(C));
-				DAG_id_tag_update(ddr->ptr.id.data, OB_RECALC_OB | OB_RECALC_DATA);
+				DEG_relations_tag_update(CTX_data_main(C));
+				DEG_id_tag_update(ddr->ptr.id.data, OB_RECALC_OB | OB_RECALC_DATA);
 				WM_event_add_notifier(C, NC_ANIMATION | ND_FCURVES_ORDER, NULL);  // XXX
 			}
 		}
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index 09388ff1a18..e47088d020e 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -42,7 +42,6 @@
 #include "BLT_lang.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_idprop.h"
 #include "BKE_layer.h"
 #include "BKE_screen.h"
@@ -51,6 +50,8 @@
 #include "BKE_text.h" /* for UI_OT_reports_to_text */
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_types.h"
@@ -396,7 +397,7 @@ static int use_property_button_exec(bContext *C, wmOperator *UNUSED(op))
 	}
 
 	/* TODO(sergey): Use proper flag for tagging here. */
-	DAG_id_tag_update((ID *)CTX_data_scene(C), 0);
+	DEG_id_tag_update((ID *)CTX_data_scene(C), 0);
 
 	return OPERATOR_FINISHED;
 }
@@ -431,7 +432,7 @@ static int unuse_property_button_exec(bContext *C, wmOperator *UNUSED(op))
 	IDP_FreeFromGroup(props, prop_to_remove);
 
 	/* TODO(sergey): Use proper flag for tagging here. */
-	DAG_id_tag_update((ID *)CTX_data_scene(C), 0);
+	DEG_id_tag_update((ID *)CTX_data_scene(C), 0);
 
 	return OPERATOR_FINISHED;
 }
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index dbef5b68a03..39294265bca 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -55,7 +55,6 @@
 
 #include "BKE_colortools.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_idcode.h"
 #include "BKE_idprop.h"
@@ -73,6 +72,9 @@
 #include "BKE_screen.h"
 #include "BKE_texture.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "ED_screen.h"
 #include "ED_object.h"
 #include "ED_render.h"
@@ -398,13 +400,13 @@ static void template_id_cb(bContext *C, void *arg_litem, void *arg_event)
 					Scene *scene = CTX_data_scene(C);
 					ED_object_single_user(bmain, scene, (struct Object *)id);
 					WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
-					DAG_relations_tag_update(bmain);
+					DEG_relations_tag_update(bmain);
 				}
 				else {
 					if (id) {
 						Main *bmain = CTX_data_main(C);
 						id_single_user(C, id, &template->ptr, template->prop);
-						DAG_relations_tag_update(bmain);
+						DEG_relations_tag_update(bmain);
 					}
 				}
 			}
@@ -1045,7 +1047,7 @@ static void modifiers_convertToReal(bContext *C, void *ob_v, void *md_v)
 	ob->partype = PAROBJECT;
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
-	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
 	ED_undo_push(C, "Modifier convert to real");
 }
@@ -1326,7 +1328,7 @@ static void do_constraint_panels(bContext *C, void *ob_pt, int event)
 			Main *bmain = CTX_data_main(C);
 			if (ob->pose)
 				BKE_pose_tag_recalc(bmain, ob->pose); /* checks & sorts pose channels */
-			DAG_relations_tag_update(bmain);
+			DEG_relations_tag_update(bmain);
 			break;
 		}
 #endif
@@ -1340,8 +1342,8 @@ static void do_constraint_panels(bContext *C, void *ob_pt, int event)
 	 * object_test_constraints(ob);
 	 * if (ob->pose) BKE_pose_update_constraint_flags(ob->pose); */
 	
-	if (ob->type == OB_ARMATURE) DAG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
-	else DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+	if (ob->type == OB_ARMATURE) DEG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
+	else DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 
 	WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT, ob);
 }