Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-02-03 16:17:12 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-02-03 16:17:12 +0300
commit445eed8e38cceb2bd2d5e449b4efd1a61c383da8 (patch)
tree9453c0ae97358926adf1abd68ccb2defd91c0597 /source/blender/blenkernel
parent701a7dcc87f312a207b6652a2afc2e32fe236f34 (diff)
Fix T43403: Compositor does not respect interlaced video
This is actually issue with Image datablock, which had obscure Fields settings but didn't allow to de-interlace the video. Now added the option to de-interlace Image with Movie input type.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/image.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index b103995e449..b405e0a6240 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2600,11 +2600,15 @@ static ImBuf *image_load_movie_file(Image *ima, ImageUser *iuser, int frame)
if (ima->anim == NULL) {
char str[FILE_MAX];
+ int flags = IB_rect;
+ if (ima->flag & IMA_DEINTERLACE) {
+ flags |= IB_animdeinterlace;
+ }
BKE_image_user_file_path(iuser, ima, str);
/* FIXME: make several stream accessible in image editor, too*/
- ima->anim = openanim(str, IB_rect, 0, ima->colorspace_settings.name);
+ ima->anim = openanim(str, flags, 0, ima->colorspace_settings.name);
/* let's initialize this user */
if (ima->anim && iuser && iuser->frames == 0)