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:
authorAntony Riakiotakis <kalast@gmail.com>2015-03-26 16:49:59 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-03-26 16:50:18 +0300
commitc0ef4e9b788b8db433bf3e92bd19ee00f86f9866 (patch)
tree3ef303f1d1cfcbfbb5c6026a20a9c288df202a75 /source/blender/blenkernel/intern/writeframeserver.c
parentf80064f2d24408aa85c84f3c328ef470baf39e7c (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/blenkernel/intern/writeframeserver.c')
-rw-r--r--source/blender/blenkernel/intern/writeframeserver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/writeframeserver.c b/source/blender/blenkernel/intern/writeframeserver.c
index ae6b19fb019..9cac86d62bd 100644
--- a/source/blender/blenkernel/intern/writeframeserver.c
+++ b/source/blender/blenkernel/intern/writeframeserver.c
@@ -110,7 +110,7 @@ static int closesocket(int fd)
}
#endif
-int BKE_frameserver_start(struct Scene *scene, RenderData *UNUSED(rd), int rectx, int recty, ReportList *reports)
+int BKE_frameserver_start(struct Scene *scene, RenderData *UNUSED(rd), int rectx, int recty, ReportList *reports, bool UNUSED(preview))
{
struct sockaddr_in addr;
int arg = 1;