summaryrefslogtreecommitdiff
path: root/scene/resources
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2018-06-08 13:42:04 -0300
committerJuan Linietsky <reduzio@gmail.com>2018-06-08 13:42:45 -0300
commit9cb17d7af8c9e49bc7baee2e70144490d6548b1d (patch)
tree83e4db9779ed6a9893732f165f984ba430f04611 /scene/resources
parent3aed396a30d4cbcfb4a63c14b8416dad024808b2 (diff)
Avoid animation length from ever being completely, fixes #19420
Diffstat (limited to 'scene/resources')
-rw-r--r--scene/resources/animation.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp
index 9c95cba357..fe4d687c23 100644
--- a/scene/resources/animation.cpp
+++ b/scene/resources/animation.cpp
@@ -32,6 +32,8 @@
#include "geometry.h"
+#define ANIM_MIN_LENGTH 0.001
+
bool Animation::_set(const StringName &p_name, const Variant &p_value) {
String name = p_name;
@@ -2524,7 +2526,9 @@ StringName Animation::animation_track_get_key_animation(int p_track, int p_key)
void Animation::set_length(float p_length) {
- ERR_FAIL_COND(length < 0);
+ if (p_length < ANIM_MIN_LENGTH) {
+ p_length = ANIM_MIN_LENGTH;
+ }
length = p_length;
emit_changed();
}