[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17867] trunk/blender/source/blender/ render/intern/source/pipeline.c: Touch/ NoOverwrite options were not disabled for video.

[Campbell Barton]

Revision: 17867
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17867
Author:   campbellbarton
Date:     2008-12-15 09:29:31 +0100 (Mon, 15 Dec 2008)

Log Message:
-----------
Touch/NoOverwrite options were not disabled for video.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2008-12-15 05:49:56 UTC (rev 17866)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2008-12-15 08:29:31 UTC (rev 17867)
@@ -2616,18 +2616,21 @@
 			else
 				nfra+= tfra;
 
-			if (scene->r.mode & (R_NO_OVERWRITE | R_TOUCH) ) {
-				BKE_makepicstring(name, scene->r.pic, scene->r.cfra, scene->r.imtype);
+			/* 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);
+				}
 			}
-			
-			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 @@
 		
 			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;