Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / anim_sys.c
index 64b33326aa95af166a2e6c4cfb16b6eb0b930c2c..5b7947df9dd3317ef1e58e6a2f7d1f8995d88311 100644 (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"
@@ -70,6 +69,8 @@
 #include "BKE_report.h"
 #include "BKE_texture.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 
 #include "nla_private.h"
@@ -93,6 +94,7 @@ bool id_type_can_have_animdata(const short id_type)
                case ID_MA: case ID_TE: case ID_NT:
                case ID_LA: case ID_CA: case ID_WO:
                case ID_LS:
+               case ID_LP:
                case ID_SPK:
                case ID_SCE:
                case ID_MC:
@@ -1600,7 +1602,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));
                }
        }
 
@@ -2555,7 +2557,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));
                }
        }
 }
@@ -2850,7 +2852,7 @@ void BKE_animsys_evaluate_all_animation(Main *main, Scene *scene, float ctime)
 
 #define DEBUG_PRINT if (G.debug & G_DEBUG_DEPSGRAPH) printf
 
-void BKE_animsys_eval_animdata(EvaluationContext *eval_ctx, ID *id)
+void BKE_animsys_eval_animdata(const EvaluationContext *eval_ctx, ID *id)
 {
        AnimData *adt = BKE_animdata_from_id(id);
        Scene *scene = NULL; /* XXX: this is only needed for flushing RNA updates,
@@ -2860,7 +2862,7 @@ void BKE_animsys_eval_animdata(EvaluationContext *eval_ctx, ID *id)
        BKE_animsys_evaluate_animdata(scene, id, adt, eval_ctx->ctime, ADT_RECALC_ANIM);
 }
 
-void BKE_animsys_eval_driver(EvaluationContext *eval_ctx,
+void BKE_animsys_eval_driver(const EvaluationContext *eval_ctx,
                              ID *id,
                              FCurve *fcu)
 {