From c0ef4e9b788b8db433bf3e92bd19ee00f86f9866 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Thu, 26 Mar 2015 14:49:59 +0100 Subject: Fix T44122, rendering OpenGL preview movie with audio has wrong audio range and extra frames. Issue here is that the movie backend would unconditionally use the start frame of the scene instead of the preview frame. Solved by passing an explicit "preview" argument. Strictly speaking, the preview argument is part of the renderdata struct, that is also passed to the code, but when rendering the final result we want to unconditionally render the full range regardless of the preview setting of the render structure. However, OpenGL rendering does use the preview range so we need to account for that when making those exports. This is also a nice chance to correct the filenames, which still used the full range. --- source/blender/render/intern/source/pipeline.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/render') diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index b397db7c31b..fe51696b16c 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -3025,7 +3025,8 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri height = re->recty; } - if (!mh->start_movie(scene, &re->r, width, height, re->reports)) + /* last argument here depends on users really, but no users using preview have been found so far */ + if (!mh->start_movie(scene, &re->r, width, height, re->reports, false)) G.is_break = true; } -- cgit v1.2.3