diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-10 15:22:33 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-10 15:23:29 +0300 |
| commit | 9a4cfc3e77fdf369da57d821b4fb4be0f4dd14bd (patch) | |
| tree | 9ac592aa23d3593a6457a52b9916403c91f20c73 /source/blender/editors/space_image | |
| parent | 440c91b1f6404082011d9e5d5a1c755d0b75ca9d (diff) | |
Partial fix of T51989: Don't set image user offset for movie files
While this is handy for image sequences, it's totally meaningless for movie files.
Diffstat (limited to 'source/blender/editors/space_image')
| -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 772d87a9bf4..a0d67626940 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1327,7 +1327,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); |