diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-04-15 16:58:25 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-07-29 15:56:03 +0300 |
| commit | cbf936a332728212c3805555c4761853d2d41981 (patch) | |
| tree | 0cefa45659ee5570ec1b8a9965343ad1cdc6e0df /source/blender/blenkernel/intern/fmodifier.c | |
| parent | ce1bc1838b611b53fe06dc3ead81eb4b0460634b (diff) | |
Gooseberry animation feature: Add toggle that disables modifiers on fcurves.
Feature is found as per channel option in graph editor.
Diffstat (limited to 'source/blender/blenkernel/intern/fmodifier.c')
| -rw-r--r-- | source/blender/blenkernel/intern/fmodifier.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index 396a260c3b8..6e78d08b508 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -1398,7 +1398,10 @@ float evaluate_time_fmodifiers(FModifierStackStorage *storage, ListBase *modifie /* sanity checks */ if (ELEM(NULL, modifiers, modifiers->last)) return evaltime; - + + if (fcu->flag & FCURVE_MOD_OFF) + return evaltime; + /* Starting from the end of the stack, calculate the time effects of various stacked modifiers * on the time the F-Curve should be evaluated at. * @@ -1455,6 +1458,9 @@ void evaluate_value_fmodifiers(FModifierStackStorage *storage, ListBase *modifie /* sanity checks */ if (ELEM(NULL, modifiers, modifiers->first)) return; + + if (fcu->flag & FCURVE_MOD_OFF) + return; /* evaluate modifiers */ for (fcm = modifiers->first; fcm; fcm = fcm->next) { |