diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-10-25 13:40:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-25 13:40:55 +0200 |
| commit | 96f92e5bfad26639e1c6af74e8872f049170a767 (patch) | |
| tree | 867caac6ac3595395e1c9142e57ce77e7114ca6f /scene/animation/tween.h | |
| parent | f259beb4f1d8c9f2417c5a80deed2ae68baa69fa (diff) | |
| parent | d0b528e4a8a9f57b6b340f5070b00964e5b75ecd (diff) | |
Merge pull request #32951 from Klowner/tween-follow-null-bug
fix Tween follow_property finishing with null
Diffstat (limited to 'scene/animation/tween.h')
| -rw-r--r-- | scene/animation/tween.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/animation/tween.h b/scene/animation/tween.h index 64ce099ecd..574238f5c9 100644 --- a/scene/animation/tween.h +++ b/scene/animation/tween.h @@ -127,7 +127,8 @@ private: real_t _run_equation(TransitionType p_trans_type, EaseType p_ease_type, real_t t, real_t b, real_t c, real_t d); Variant &_get_delta_val(InterpolateData &p_data); - Variant &_get_initial_val(InterpolateData &p_data); + Variant _get_initial_val(const InterpolateData &p_data) const; + Variant _get_final_val(const InterpolateData &p_data) const; Variant _run_equation(InterpolateData &p_data); bool _calc_delta_val(const Variant &p_initial_val, const Variant &p_final_val, Variant &p_delta_val); bool _apply_tween_value(InterpolateData &p_data, Variant &value); |