diff options
| author | volzhs <volzhs@gmail.com> | 2015-06-28 22:28:02 +0900 |
|---|---|---|
| committer | volzhs <volzhs@gmail.com> | 2015-06-28 22:28:02 +0900 |
| commit | 584dd4db878d0a9ebf44dc529dad35bf8dd4796b (patch) | |
| tree | c601222ba20cacc80fba7ff43b5de425db13519c /tools/editor/animation_editor.cpp | |
| parent | 81a1f32f0c1e4f64bb102c6aa46bcbb4e18bcd55 (diff) | |
| parent | 2b64f73b0459190d20b2f6de39275ee7979317c4 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
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; } |