diff options
| author | Kostadin Damyanov <maxmight@gmail.com> | 2015-06-26 21:35:47 +0300 |
|---|---|---|
| committer | Kostadin Damyanov <maxmight@gmail.com> | 2015-06-26 21:35:47 +0300 |
| commit | e0e54ea7d456c0fabd8f3f9b2667a69ff520f852 (patch) | |
| tree | 9ce4e0b6db40ac2ab07b8582e57282fe63130165 /tools/editor/animation_editor.cpp | |
| parent | f61eb5fd8e13642c82364f8ee66a0f6c791a4511 (diff) | |
| parent | a67486a39ee629acac068a6d014015944cf83bb3 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tools/editor/animation_editor.cpp')
| -rw-r--r-- | tools/editor/animation_editor.cpp | 3 |
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; } |