diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-12-15 11:29:31 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-12-15 11:29:31 +0300 |
commit | d99686a783ca65cb29792396c70182c3330813c3 (patch) | |
tree | 32f6af53cf5523273b7b8982eef9d9f01f7462b1 | |
parent | ba6972eb4db3f4b1cf5e2f6132efab90d9357a9b (diff) |
Touch/NoOverwrite options were not disabled for video.
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 1dfcbc6e45d..9ef9c2f3859 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -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; |