[patch] Show animation from Sta: to End: and only in that interval.

blender-img-last.patch (text/plain), 3.39 KB, created by Alexey Dobriyan on 2006-07-18 17:24:58 UTC

--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -473,7 +473,7 @@ static void ftype_pic(char *name)
 	allqueue(REDRAWBUTSSCENE, 0);
 }
 
-static void run_playanim(char *file) 
+static void run_playanim(char *file, char *file_end) 
 {
 	extern char bprogname[];	/* usiblender.c */
 	char str[FILE_MAXDIR+FILE_MAXFILE];
@@ -483,13 +483,14 @@ static void run_playanim(char *file) 
 	calc_renderwin_rectangle((G.scene->r.xsch*G.scene->r.size)/100, 
 							 (G.scene->r.ysch*G.scene->r.size)/100, G.winpos, pos, size);
 
-	sprintf(str, "%s -a -p %d %d \"%s\"", bprogname, pos[0], pos[1], file);
+	sprintf(str, "%s -a -p %d %d -e \"%s\" \"%s\"", bprogname, pos[0], pos[1], file_end, file);
 	system(str);
 }
 
 void playback_anim(void)
 {	
 	char file[FILE_MAXDIR+FILE_MAXFILE];
+	char file_end[FILE_MAXDIR+FILE_MAXFILE];
 
 	if(BKE_imtype_is_movie(G.scene->r.imtype)) {
 		switch (G.scene->r.imtype) {
@@ -508,16 +509,18 @@ #endif
 			break;
 		}
 		if(BLI_exist(file)) {
-			run_playanim(file);
+			run_playanim(file, "stfu");
 		}
 		else error("Can't find movie: %s", file);
 	}
 	else {
 		BKE_makepicstring(file, G.scene->r.sfra);
-		if(BLI_exist(file)) {
-			run_playanim(file);
-		}
-		else error("Can't find image: %s", file);
+		BKE_makepicstring(file_end, G.scene->r.efra);
+		if(!BLI_exist(file))
+			error("Can't find image: %s", file);
+		if(!BLI_exist(file_end))
+			error("Can't find image: %s", file_end);
+		run_playanim(file, file_end);
 	}
 }
 
diff --git a/source/blender/src/playanim.c b/source/blender/src/playanim.c
index d719b4f..13dcfe8 100644
--- a/source/blender/src/playanim.c
+++ b/source/blender/src/playanim.c
@@ -212,7 +212,7 @@ static void toscreen(Pict *picture, stru
 	window_swap_buffers(g_window);
 }
 
-static void build_pict_list(char * first)
+static void build_pict_list(char * first, char * last)
 {
 	int size,pic,file;
 	char *mem, name[256];
@@ -261,7 +261,7 @@ static void build_pict_list(char * first
             O_DIRECT is a Silicon Graphics extension and is only supported on
             local EFS and XFS file systems.
 */
-		while(IMB_ispic(name)){
+		while(IMB_ispic(name) && strcmp(name, last) != 0){
 			file = open(name, O_BINARY|O_RDONLY, 0);
 			if (file < 0) return;
 			picture = (struct pict*)MEM_callocN(sizeof(struct pict), "picture");
@@ -329,7 +329,7 @@ void playanim(int argc, char **argv)
 {
 	struct ImBuf *ibuf = 0;
 	struct pict *picture = 0;
-	char name[256];
+	char name[256], name_last[256];
 	short val = 0, go = TRUE, ibufx = 0, ibufy = 0;
 	int event, stopped = FALSE, maxwinx, maxwiny;
 	short /*  c233 = FALSE, */ /*  yuvx = FALSE, */ once = FALSE, sstep = FALSE, wait2 = FALSE, /*  resetmap = FALSE, */ pause = 0;
@@ -355,6 +355,14 @@ void playanim(int argc, char **argv)
 						printf("too few arguments for -p (need 2): skipping\n");
 					}
 					break;
+				case 'e':
+					if (argc > 2) {
+						strncpy(name_last, argv[2], sizeof(name_last) - 1);
+						argc--;
+						argv++;
+					} else
+						printf("too few arguments for -e (need 1): skipping\n");
+					break;
 				default:
 					printf("unknown option '%c': skipping\n", argv[1][1]);
 					break;
@@ -439,11 +447,11 @@ #endif /* WITH_QUICKTIME */
 	
 	window_swap_buffers(g_window);
 	
-	build_pict_list(name);
+	build_pict_list(name, name_last);
 	
 	for (i = 2; i < argc; i++){
 		strcpy(name, argv[i]);
-		build_pict_list(name);
+		build_pict_list(name, name_last);
 	}
 
 	IMB_freeImBuf(ibuf);