diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_writeavi.h | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/writeavi.c | 1 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 17 |
3 files changed, 0 insertions, 21 deletions
diff --git a/source/blender/blenkernel/BKE_writeavi.h b/source/blender/blenkernel/BKE_writeavi.h index 72817217a0a..3212bad75cb 100644 --- a/source/blender/blenkernel/BKE_writeavi.h +++ b/source/blender/blenkernel/BKE_writeavi.h @@ -53,9 +53,6 @@ typedef struct bMovieHandle { const char *suffix, struct ReportList *reports); void (*end_movie)(void *context_v); - int (*get_next_frame)(void *context_v, - struct RenderData *rd, - struct ReportList *reports); /* optional */ void (*get_movie_path)(char *string, struct RenderData *rd, bool preview, diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c index b72b99e514d..19425a0d80b 100644 --- a/source/blender/blenkernel/intern/writeavi.c +++ b/source/blender/blenkernel/intern/writeavi.c @@ -118,7 +118,6 @@ bMovieHandle *BKE_movie_handle_get(const char imtype) mh.start_movie = start_stub; mh.append_movie = append_stub; mh.end_movie = end_stub; - mh.get_next_frame = NULL; mh.get_movie_path = NULL; mh.context_create = context_create_stub; mh.context_free = context_free_stub; diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 981a305e443..044b0d5ad87 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2530,23 +2530,6 @@ void RE_RenderAnim(Render *re, for (nfra = sfra, scene->r.cfra = sfra; scene->r.cfra <= efra; scene->r.cfra++) { char name[FILE_MAX]; - /* Special case for 'mh->get_next_frame' - * this overrides regular frame stepping logic */ - if (mh && mh->get_next_frame) { - while (G.is_break == false) { - int nfra_test = mh->get_next_frame(re->movie_ctx_arr[0], &re->r, re->reports); - if (nfra_test >= 0 && nfra_test >= sfra && nfra_test <= efra) { - nfra = nfra_test; - break; - } - else { - if (re->test_break(re->tbh)) { - G.is_break = true; - } - } - } - } - /* Here is a feedback loop exists -- render initialization requires updated * render layers settings which could be animated, but scene evaluation for * the frame happens later because it depends on what layers are visible to |