diff options
| author | Phil Gosch <phil@saphirestudio.at> | 2017-09-29 23:52:29 +0300 |
|---|---|---|
| committer | Phil Gosch <phil@saphirestudio.at> | 2017-09-29 23:52:29 +0300 |
| commit | 2b1ec9c18fadf6b5cd71a7d4122776f5d4b8ac33 (patch) | |
| tree | 01b477f0ea027ab5908f332f6102db6a1d381b76 /source/blender/editors/space_graph/graph_edit.c | |
| parent | 5cdd4388ffaad5ade916dba3c18e2bc679e19747 (diff) | |
| parent | e3546a5097b1b30a3c694ce0f6b98c2f7e70510c (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2016-uv_toolssoc-2016-uv_tools
Diffstat (limited to 'source/blender/editors/space_graph/graph_edit.c')
| -rw-r--r-- | source/blender/editors/space_graph/graph_edit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index f38d36853d7..861a38da2c7 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -195,8 +195,8 @@ static int graphkeys_previewrange_exec(bContext *C, wmOperator *UNUSED(op)) /* set the range directly */ get_graph_keyframe_extents(&ac, &min, &max, NULL, NULL, false, false); scene->r.flag |= SCER_PRV_RANGE; - scene->r.psfra = iroundf(min); - scene->r.pefra = iroundf(max); + scene->r.psfra = round_fl_to_int(min); + scene->r.pefra = round_fl_to_int(max); /* set notifier that things have changed */ // XXX err... there's nothing for frame ranges yet, but this should do fine too @@ -2036,7 +2036,7 @@ static int graphkeys_framejump_exec(bContext *C, wmOperator *UNUSED(op)) } else { /* Animation Mode - Affects current frame (int) */ - CFRA = iroundf(ked.f1 / ked.i1); + CFRA = round_fl_to_int(ked.f1 / ked.i1); SUBFRA = 0.f; sipo->cursorVal = ked.f2 / (float)ked.i1; } |