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>2012-02-23 14:18:10 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-02-23 14:18:10 +0400
commit4662e40bfa3f8a35a73ac42029e3da5ef280d86d (patch)
tree498aa885d425b10838259774245bb1e17dcfd95c /source/blender/imbuf/intern/indexer.c
parentd881bb4b32d1dff089b6f8c61d0f0fdd16d2b82b (diff)
Fix #30315: Temporary proxy files are not erased and old proxys are not updated if the proxy is built more then once (windows)
Two issues are fixed here: - On windows rename() doesn't actually renames file if destination file is already exist. Solved by ulinking previously built proxy/timecode. - IMB_TC_MAX_SLOT was set to incorrect value leading to record run timecode calculating several times.
Diffstat (limited to 'source/blender/imbuf/intern/indexer.c')
-rw-r--r--source/blender/imbuf/intern/indexer.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
index ade63aa1e9c..f36db61f27a 100644
--- a/source/blender/imbuf/intern/indexer.c
+++ b/source/blender/imbuf/intern/indexer.c
@@ -147,6 +147,7 @@ void IMB_index_builder_finish(anim_index_builder * fp, int rollback)
if (rollback) {
unlink(fp->temp_name);
} else {
+ unlink(fp->name);
rename(fp->temp_name, fp->name);
}
@@ -687,6 +688,7 @@ static void free_proxy_output_ffmpeg(struct proxy_output_ctx * ctx,
} else {
get_proxy_filename(ctx->anim, ctx->proxy_size,
fname, FALSE);
+ unlink(fname);
rename(fname_tmp, fname);
}
@@ -1043,6 +1045,7 @@ static void index_rebuild_fallback(struct anim * anim,
if (*stop) {
unlink(fname_tmp);
} else {
+ unlink(fname);
rename(fname_tmp, fname);
}
}