[Bf-blender-cvs] [9a4cfc3e77f] master: Partial fix of T51989: Don't set image user offset for movie files

Sergey Sharybin noreply at git.blender.org
Mon Jul 10 14:39:28 CEST 2017


Commit: 9a4cfc3e77fdf369da57d821b4fb4be0f4dd14bd
Author: Sergey Sharybin
Date:   Mon Jul 10 14:22:33 2017 +0200
Branches: master
https://developer.blender.org/rB9a4cfc3e77fdf369da57d821b4fb4be0f4dd14bd

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.

===================================================================

M	source/blender/editors/space_image/image_ops.c

===================================================================

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);




More information about the Bf-blender-cvs mailing list