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-11-16 14:53:46 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-11-16 14:53:46 +0300
commit59ed62fb5f183b1edfb499f6fa0f8e1919099944 (patch)
treec1ad794878f4b90b41c510348f0580ff4c8f52f3
parent19bfc3eb388d7ff0791300d80dd9550d9cbfb17b (diff)
Remove unused arguments from RE_WriteRenderViewsMovie()
-rw-r--r--source/blender/editors/render/render_opengl.c4
-rw-r--r--source/blender/render/extern/include/RE_pipeline.h2
-rw-r--r--source/blender/render/intern/source/pipeline.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index 738ee1faed3..2b23b683af0 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -750,8 +750,8 @@ static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op)
rr = RE_AcquireResultRead(oglrender->re);
if (is_movie) {
- ok = RE_WriteRenderViewsMovie(oglrender->reports, rr, scene, &scene->r, oglrender->mh, oglrender->sizex,
- oglrender->sizey, oglrender->movie_ctx_arr, oglrender->totvideos, PRVRANGEON != 0);
+ ok = RE_WriteRenderViewsMovie(oglrender->reports, rr, scene, &scene->r, oglrender->mh,
+ oglrender->movie_ctx_arr, oglrender->totvideos, PRVRANGEON != 0);
if (ok) {
printf("Append frame %d", scene->r.cfra);
BKE_reportf(op->reports, RPT_INFO, "Appended frame: %d", scene->r.cfra);
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index 131a5a3a966..99e0bd7b62f 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -277,7 +277,7 @@ bool RE_WriteRenderViewsImage(
struct ReportList *reports, struct RenderResult *rr, struct Scene *scene, const bool stamp, char *name);
bool RE_WriteRenderViewsMovie(
struct ReportList *reports, struct RenderResult *rr, struct Scene *scene, struct RenderData *rd,
- struct bMovieHandle *mh, const size_t width, const size_t height, void **movie_ctx_arr,
+ struct bMovieHandle *mh, void **movie_ctx_arr,
const int totvideos, bool preview);
/* only RE_NewRender() needed, main Blender render calls */
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 0d2543eca81..a9f754c05cd 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -3340,7 +3340,7 @@ bool RE_WriteRenderViewsImage(ReportList *reports, RenderResult *rr, Scene *scen
bool RE_WriteRenderViewsMovie(
ReportList *reports, RenderResult *rr, Scene *scene, RenderData *rd, bMovieHandle *mh,
- const size_t width, const size_t height, void **movie_ctx_arr, const int totvideos, bool preview)
+ void **movie_ctx_arr, const int totvideos, bool preview)
{
bool is_mono;
bool ok = true;
@@ -3421,7 +3421,7 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
/* write movie or image */
if (BKE_imtype_is_movie(scene->r.im_format.imtype)) {
- RE_WriteRenderViewsMovie(re->reports, &rres, scene, &re->r, mh, re->rectx, re->recty, re->movie_ctx_arr, totvideos, false);
+ RE_WriteRenderViewsMovie(re->reports, &rres, scene, &re->r, mh, re->movie_ctx_arr, totvideos, false);
}
else {
if (name_override)