griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Touch/NoOverwrite options were not disabled for video.

Browse Source
This commit is contained in:
Campbell Barton
2008-12-15 08:29:31 +00:00
parent ba6972eb4d
commit d99686a783
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/render/intern/source/pipeline.c
View File

@@ -2616,17 +2616,20 @@ void RE_BlenderAnim(Render *re, Scene *scene, int sfra, int efra, int tfra)
else
nfra+= tfra;
if (scene->r.mode & (R_NO_OVERWRITE | R_TOUCH) ) {
BKE_makepicstring(name, scene->r.pic, scene->r.cfra, scene->r.imtype);
}
if (scene->r.mode & R_NO_OVERWRITE && BLI_exist(name)) {
printf("skipping existing frame \"%s\"\n", name);
continue;
}
if (scene->r.mode & R_TOUCH && !BLI_exist(name)) {
BLI_make_existing_file(name); /* makes the dir if its not there */
BLI_touch(name);
/* Touch/NoOverwrite options are only valid for image's */
if(BKE_imtype_is_movie(scene->r.imtype) == 0) {
if (scene->r.mode & (R_NO_OVERWRITE | R_TOUCH) ) {
BKE_makepicstring(name, scene->r.pic, scene->r.cfra, scene->r.imtype);
}
if (scene->r.mode & R_NO_OVERWRITE && BLI_exist(name)) {
printf("skipping existing frame \"%s\"\n", name);
continue;
}
if (scene->r.mode & R_TOUCH && !BLI_exist(name)) {
BLI_make_existing_file(name); /* makes the dir if its not there */
BLI_touch(name);
}
}
re->r.cfra= scene->r.cfra; /* weak.... */
@@ -2639,8 +2642,10 @@ void RE_BlenderAnim(Render *re, Scene *scene, int sfra, int efra, int tfra)
if(G.afbreek==1) {
/* remove touched file */
if (scene->r.mode & R_TOUCH && BLI_exist(name) && BLI_filepathsize(name) == 0) {
BLI_delete(name, 0, 0);
if(BKE_imtype_is_movie(scene->r.imtype) == 0) {
if (scene->r.mode & R_TOUCH && BLI_exist(name) && BLI_filepathsize(name) == 0) {
BLI_delete(name, 0, 0);
}
}
break;