diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-09-27 04:18:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-27 04:18:23 +0300 |
| commit | 9bd40cbce17fdc6368814f7cdeaef9bca3fcb7e5 (patch) | |
| tree | 0a7a20e1987174f6d56fe71bc119f8f54cf6b1b5 /source/blender/editors/space_image/image_ops.c | |
| parent | a24dd6eabafa421352488bc8721a02690da2177f (diff) | |
| parent | 43b49130516db974c125d89919fe8ddc25cf4405 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_image/image_ops.c')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 6c5e87f5006..4e9e493c318 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -3529,7 +3529,7 @@ static int frame_from_event(bContext *C, const wmEvent *event) UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &viewx, &viewy); - framenr = iroundf(viewx); + framenr = round_fl_to_int(viewx); } return framenr; |