diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-03-01 14:01:27 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-03-01 14:01:27 +0100 |
| commit | c26f753ffe0e853bc248a76165935f169cb2dbbb (patch) | |
| tree | fbb1ea115bd472306be53c02186ff0941961e0dd /core/variant.h | |
| parent | a12c63ef9e6332d0003228e1d8d79a57ef3995fb (diff) | |
| parent | 391ce81c5ea037ffcbc525434673f4edd55a7d7e (diff) | |
Merge pull request #3757 from JoshuaGrams/animation-tree-blending
AnimationTreePlayer: blend value tracks (intended to close #2299)
Diffstat (limited to 'core/variant.h')
| -rw-r--r-- | core/variant.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/variant.h b/core/variant.h index b58c781bdd..d8813c4937 100644 --- a/core/variant.h +++ b/core/variant.h @@ -372,6 +372,8 @@ public: return res; } + void zero(); + static void blend(const Variant& a, const Variant& b, float c,Variant &r_dst); static void interpolate(const Variant& a, const Variant& b, float c,Variant &r_dst); struct CallError { |