summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-06-22 23:57:28 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-06-22 23:57:28 -0300
commit5092cc46b4f8044c99234fb47d7941d7bcb11c41 (patch)
tree7f788353904e8c77b39b00ad76480b71ac52372f /tools
parent3abb54871f53a767d52aa16f0c8637531a6e547c (diff)
parent2287d030a25d8c52d1ebe2303794d6cfa740e6a0 (diff)
Merge pull request #2070 from Krzycho666/AnimationPlayer_fix
Animation player set_steps fix
Diffstat (limited to 'tools')
-rw-r--r--tools/editor/animation_editor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp
index bb6f7e9a6f..d431af6c8d 100644
--- a/tools/editor/animation_editor.cpp
+++ b/tools/editor/animation_editor.cpp
@@ -3319,7 +3319,8 @@ void AnimationKeyEditor::_insert_delay() {
void AnimationKeyEditor::_step_changed(float p_len) {
updating=true;
- animation->set_step(p_len);
+ if (!animation.is_null())
+ animation->set_step(p_len);
updating=false;
}