diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-01-30 18:00:30 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-01-30 18:00:30 +0300 |
| commit | b58b182753e50aa10a1e5c7d152d5787aae433e0 (patch) | |
| tree | c51a8c3c13691f684b2c823f021a5518b2959abd /source/blender/blenkernel/intern/sequencer.c | |
| parent | f7e8da6f5a5353c20a229e74d768384b5b1e5794 (diff) | |
Get rid of the file touch hack.
If user cancels, there's an issue with leftover files.
Instead use a hash to record files that have akready been registered for
generation and skip them if so.
That should guarantee things will go smoothly and when a file exists it
is assumed to be valid.
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index e27116f07f8..45036369269 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -1532,7 +1532,7 @@ static void seq_proxy_build_frame(const SeqRenderData *context, Sequence *seq, i IMB_freeImBuf(ibuf); } -SeqIndexBuildContext *BKE_sequencer_proxy_rebuild_context(Main *bmain, Scene *scene, Sequence *seq) +SeqIndexBuildContext *BKE_sequencer_proxy_rebuild_context(Main *bmain, Scene *scene, Sequence *seq, struct GSet *file_list) { SeqIndexBuildContext *context; Sequence *nseq; @@ -1565,7 +1565,7 @@ SeqIndexBuildContext *BKE_sequencer_proxy_rebuild_context(Main *bmain, Scene *sc if (nseq->anim) { context->index_context = IMB_anim_index_rebuild_context(nseq->anim, context->tc_flags, context->size_flags, context->quality, - context->overwrite); + context->overwrite, file_list); } } |