[Bf-blender-cvs] [00fa0996687] soc-2020-info-editor: Merge branch 'master' into soc-2020-info-editor

[Mateusz Grzeliński]

Commit: 00fa0996687086288cec965f6880572dead9c6ec
Author: Mateusz Grzeliński
Date:   Tue Jul 21 15:34:13 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rB00fa0996687086288cec965f6880572dead9c6ec

Merge branch 'master' into soc-2020-info-editor

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



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

diff --cc source/blender/blenkernel/intern/anim_sys.c
index 35c58d50f06,ea5a4bd99d1..a7f019a9dfa
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@@ -2240,9 -2305,11 +2292,9 @@@ static void animsys_calculate_nla(Point
    else {
      /* special case - evaluate as if there isn't any NLA data */
      /* TODO: this is really just a stop-gap measure... */
 -    if (G.debug & G_DEBUG) {
 -      CLOG_WARN(&LOG, "NLA Eval: Stopgap for active action on NLA Stack - no strips case");
 -    }
 +    CLOG_WARN(&LOG, "NLA Eval: Stopgap for active action on NLA Stack - no strips case");
  
-     animsys_evaluate_action(ptr, adt->action, ctime, flush_to_original);
+     animsys_evaluate_action(ptr, adt->action, anim_eval_context, flush_to_original);
    }
  
    /* free temp data */
@@@ -2538,9 -2609,13 +2594,11 @@@ void BKE_animsys_evaluate_all_animation
  {
    ID *id;
  
 -  if (G.debug & G_DEBUG) {
 -    printf("Evaluate all animation - %f\n", ctime);
 -  }
 +  CLOG_VERBOSE(&LOG, 3, "Evaluate all animation - %f", ctime);
  
    const bool flush_to_original = DEG_is_active(depsgraph);
+   const AnimationEvalContext anim_eval_context = BKE_animsys_eval_context_construct(depsgraph,
+                                                                                     ctime);
  
    /* macros for less typing
     * - only evaluate animation data for id if it has users (and not just fake ones)
diff --cc source/blender/blenkernel/intern/constraint.c
index 1bf52a81655,2ef32895db9..7a68295ef19
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@@ -2679,13 -2680,15 +2680,15 @@@ static void actcon_get_tarmat(struct De
      s = (vec[axis] - data->min) / (data->max - data->min);
      CLAMP(s, 0, 1);
      t = (s * (data->end - data->start)) + data->start;
+     const AnimationEvalContext anim_eval_context = BKE_animsys_eval_context_construct(depsgraph,
+                                                                                       t);
  
 -    if (G.debug & G_DEBUG) {
 -      printf("do Action Constraint %s - Ob %s Pchan %s\n",
 -             con->name,
 -             cob->ob->id.name + 2,
 -             (cob->pchan) ? cob->pchan->name : NULL);
 -    }
 +    CLOG_VERBOSE(&LOG,
 +                 1,
 +                 "do Action Constraint %s - Ob %s Pchan %s",
 +                 con->name,
 +                 cob->ob->id.name + 2,
 +                 (cob->pchan) ? cob->pchan->name : NULL);
  
      /* Get the appropriate information from the action */
      if (cob->type == CONSTRAINT_OBTYPE_OBJECT || (data->flag & ACTCON_BONE_USE_OBJECT_ACTION)) {