diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-21 17:28:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-21 17:28:14 +0200 |
| commit | 91ee2f60591d0b47d5eca8783ffbd15caa9c4665 (patch) | |
| tree | 13ff0bb3ecf60ac6db3fee075139ccfd22ac6757 /scene | |
| parent | 81a5e4238d43891442556c5ed208a15ee938b2cd (diff) | |
| parent | bd5c8f2aa086c2cacc704dfef249c124760ab569 (diff) | |
Merge pull request #5335 from J08nY/loop-interpolation-scene-fix
Animation: Fix property loop_interpolation
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/resources/animation.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index 9b657d1b8f..8be39e3021 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -270,6 +270,8 @@ bool Animation::_get(const StringName& p_name,Variant &r_ret) const { r_ret= length; else if (name=="loop") r_ret= loop; + else if (name=="loop_interpolation") + r_ret= loop_interpolation; else if (name=="step") r_ret= step; else if (name.begins_with("tracks/")) { @@ -435,6 +437,7 @@ void Animation::_get_property_list( List<PropertyInfo> *p_list) const { p_list->push_back( PropertyInfo( Variant::REAL, "length", PROPERTY_HINT_RANGE, "0.001,99999,0.001")); p_list->push_back( PropertyInfo( Variant::BOOL, "loop" )); + p_list->push_back( PropertyInfo( Variant::BOOL, "loop_interpolation")); p_list->push_back( PropertyInfo( Variant::REAL, "step", PROPERTY_HINT_RANGE, "0,4096,0.001" )); for (int i=0;i<tracks.size();i++) { @@ -1639,7 +1642,7 @@ bool Animation::has_loop() const { return loop; } bool Animation::has_loop_interpolation() const { - + return loop_interpolation; } @@ -2039,5 +2042,3 @@ Animation::~Animation() { memdelete( tracks[i] ); } - - |