diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-03-26 16:49:59 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-03-26 16:50:18 +0300 |
| commit | c0ef4e9b788b8db433bf3e92bd19ee00f86f9866 (patch) | |
| tree | 3ef303f1d1cfcbfbb5c6026a20a9c288df202a75 /source/blender/render | |
| parent | f80064f2d24408aa85c84f3c328ef470baf39e7c (diff) | |
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.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |