Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_graph / graph_edit.c
index 0370a91..ef4bb91 100644 (file)
@@ -36,7 +36,7 @@
 #include <float.h>
 
 #ifdef WITH_AUDASPACE
-#  include AUD_SPECIAL_H
+#  include <AUD_Special.h>
 #endif
 
 #include "MEM_guardedalloc.h"
 
 #include "BLT_translation.h"
 
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_nla.h"
 #include "BKE_context.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph_build.h"
+
 #include "UI_view2d.h"
 
 #include "ED_anim_api.h"
@@ -525,6 +526,7 @@ static void insert_graph_keys(bAnimContext *ac, eGraphKeys_InsertKey_Types mode)
 
        ReportList *reports = ac->reports;
        SpaceIpo *sipo = (SpaceIpo *)ac->sl;
+       struct Depsgraph *depsgraph = ac->depsgraph;
        Scene *scene = ac->scene;
        ToolSettings *ts = scene->toolsettings;
        short flag = 0;
@@ -607,7 +609,7 @@ static void insert_graph_keys(bAnimContext *ac, eGraphKeys_InsertKey_Types mode)
                         *                        up adding the keyframes on a new F-Curve in the action data instead.
                         */
                        if (ale->id && !ale->owner && !fcu->driver) {
-                               insert_keyframe(reports, ale->id, NULL, ((fcu->grp) ? (fcu->grp->name) : (NULL)), fcu->rna_path, fcu->array_index, cfra, ts->keyframe_type, flag);
+                               insert_keyframe(depsgraph, reports, ale->id, NULL, ((fcu->grp) ? (fcu->grp->name) : (NULL)), fcu->rna_path, fcu->array_index, cfra, ts->keyframe_type, flag);
                        }
                        else {
                                const float curval = evaluate_fcurve(fcu, cfra);
@@ -2714,7 +2716,7 @@ static int graph_driver_vars_paste_exec(bContext *C, wmOperator *op)
        /* successful or not? */
        if (ok) {
                /* rebuild depsgraph, now that there are extra deps here */
-               DAG_relations_tag_update(CTX_data_main(C));
+               DEG_relations_tag_update(CTX_data_main(C));
 
                /* set notifier that keyframes have changed */
                WM_event_add_notifier(C, NC_SCENE | ND_FRAME, CTX_data_scene(C));
@@ -2788,7 +2790,7 @@ static int graph_driver_delete_invalid_exec(bContext *C, wmOperator *op)
 
        if (deleted > 0) {
                /* notify the world of any changes */
-               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 | NA_REMOVED, NULL);
                WM_reportf(RPT_INFO, "Deleted %u drivers", deleted);
        }