diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-07-11 07:21:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-11 07:21:05 +0300 |
| commit | 64dd9a117dfabad1a9372d34e8804e7ec1ad9828 (patch) | |
| tree | d08580f3bb835a3499471da8478c4a61f1e2b0aa /source/blender/editors/space_image/image_ops.c | |
| parent | bb0bdc6ce262b6293bd351c97ea05990c9315dd7 (diff) | |
| parent | a247b367b0f7c0486ed8eef4c2a5a753e963ea6c (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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 8890aa5d1ac..659dfbfd57d 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1330,7 +1330,11 @@ static int image_open_exec(bContext *C, wmOperator *op) iuser->frames = frame_seq_len; iuser->sfra = 1; iuser->framenr = 1; - iuser->offset = frame_ofs - 1; + if (ima->source == IMA_SRC_MOVIE) { + iuser->offset = 0; + } else { + iuser->offset = frame_ofs - 1; + } iuser->fie_ima = 2; iuser->scene = scene; BKE_image_init_imageuser(ima, iuser); |