[Bf-blender-cvs] [f430127] master: Fix T40757: Video Texture - Video frames dropped from beginning and end

[Sergey Sharybin]

Commit: f430127bbd1ec808745ea82bbf19bff71975cb53
Author: Sergey Sharybin
Date:   Wed Jun 25 17:52:21 2014 +0600
https://developer.blender.org/rBf430127bbd1ec808745ea82bbf19bff71975cb53

Fix T40757: Video Texture - Video frames dropped from beginning and end

it's actually a followup for 04f81c8, no need to apply offset for video 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 902398f..cc769f1 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1040,7 +1040,11 @@ static int image_open_exec(bContext *C, wmOperator *op)
 
 	const bool is_relative_path = RNA_boolean_get(op->ptr, "relative_path");
 
-	if (RNA_struct_property_is_set(op->ptr, "files") && RNA_struct_property_is_set(op->ptr, "directory")) {	
+	RNA_string_get(op->ptr, "filepath", path);
+
+	if (!IMB_isanim(path) && RNA_struct_property_is_set(op->ptr, "files") &&
+	    RNA_struct_property_is_set(op->ptr, "directory"))
+	{
 		ListBase frames;
 
 		BLI_listbase_clear(&frames);
@@ -1048,9 +1052,6 @@ static int image_open_exec(bContext *C, wmOperator *op)
 		frame_seq_len = image_sequence_get_len(&frames, &frame_ofs);
 		BLI_freelistN(&frames);
 	}
-	else {
-		RNA_string_get(op->ptr, "filepath", path);
-	}
 
 	errno = 0;