diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-25 15:52:21 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-25 15:52:21 +0400 |
commit | f430127bbd1ec808745ea82bbf19bff71975cb53 (patch) | |
tree | 5ce09eb577216b320044ad7b069164376ca63a3b | |
parent | deb3999696cbcbe19ace96f334477a985e835060 (diff) |
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.
-rw-r--r-- | source/blender/editors/space_image/image_ops.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 902398fb6d2..cc769f13b82 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; |