[Bf-blender-cvs] [9583932538a] master: Fix T70986: NLA strip Animated Influence does not respect Default Interpolation

Philipp Oeser noreply at git.blender.org
Thu Jan 2 12:50:33 CET 2020


Commit: 9583932538a7fe7d40d18200b7b22a25b87535d9
Author: Philipp Oeser
Date:   Sat Dec 28 22:53:13 2019 +0100
Branches: master
https://developer.blender.org/rB9583932538a7fe7d40d18200b7b22a25b87535d9

Fix T70986: NLA strip Animated Influence does not respect Default Interpolation

Since we are already respecting the User Preference for 'auto_smoothing'
in 'BKE_nlastrip_validate_fcurves', we should also do this for default
interpolation and handles.

Maniphest Tasks: T70986

Differential Revision: https://developer.blender.org/D6490

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

M	source/blender/blenkernel/intern/nla.c

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

diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index 09581debd99..7aa8837d139 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -1499,6 +1499,10 @@ void BKE_nlastrip_validate_fcurves(NlaStrip *strip)
 
       fcu->bezt->vec[1][0] = strip->start;
       fcu->bezt->vec[1][1] = strip->influence;
+
+      /* Respect User Preferences for default interpolation and handles. */
+      fcu->bezt->h1 = fcu->bezt->h2 = U.keyhandles_new;
+      fcu->bezt->ipo = U.ipo_new;
     }
   }



More information about the Bf-blender-cvs mailing list