Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / animation / keyframing.c
index 540886196febcab073607542b337a4ef8ba168eb..66872c77b04e227771e1c21fdb7a6307b19e3b96 100644 (file)
@@ -56,7 +56,6 @@
 #include "BKE_animsys.h"
 #include "BKE_action.h"
 #include "BKE_armature.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_idcode.h"
 #include "BKE_nla.h"
@@ -66,6 +65,9 @@
 #include "BKE_key.h"
 #include "BKE_material.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "ED_anim_api.h"
 #include "ED_keyframing.h"
 #include "ED_keyframes_edit.h"
@@ -155,7 +157,7 @@ bAction *verify_adt_action(ID *id, short add)
 
                /* tag depsgraph to be rebuilt to include time dependency */
                /* XXX: we probably should have bmain passed down, but that involves altering too many API's */
-               DAG_relations_tag_update(G.main);
+               DEG_relations_tag_update(G.main);
        }
                
        /* return the action */
@@ -1617,7 +1619,7 @@ static int clear_anim_v3d_exec(bContext *C, wmOperator *UNUSED(op))
                                /* delete F-Curve completely */
                                if (can_delete) {
                                        ANIM_fcurve_delete_from_animdata(NULL, adt, fcu);
-                                       DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+                                       DEG_id_tag_update(&ob->id, OB_RECALC_OB);
                                        changed = true;
                                }
                        }
@@ -1724,7 +1726,7 @@ static int delete_key_v3d_exec(bContext *C, wmOperator *op)
                else
                        BKE_reportf(op->reports, RPT_ERROR, "No keyframes removed from Object '%s'", id->name + 2);
                
-               DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+               DEG_id_tag_update(&ob->id, OB_RECALC_OB);
        }
        CTX_DATA_END;