griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
it's actually a followup for 04f81c8, no need to apply offset for video files.
This commit is contained in:
Sergey Sharybin
2014-06-25 17:52:21 +06:00
parent deb3999696
commit f430127bbd
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/space_image/image_ops.c
View File

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