Bugfix #4663

Play option: if you set output to render to .avi, but in the same
directory also individual files exist, it always played the files, not
the movie.

Now it checks for the Output type, and plays back a movie or frames, as
indicated.

1 files changed, 17 insertions, 14 deletions

diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index 26c3cceed7d..9d9783f96b5 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -490,24 +490,27 @@ static void run_playanim(char *file)
 void playback_anim(void)
 {	
 	char file[FILE_MAXDIR+FILE_MAXFILE];
-	
-	switch (G.scene->r.imtype) {
+
+	if(BKE_imtype_is_movie(G.scene->r.imtype)) {
+		switch (G.scene->r.imtype) {
 #ifdef WITH_QUICKTIME
-	case R_QUICKTIME:
-		makeqtstring(file);
-		break;
+			case R_QUICKTIME:
+				makeqtstring(file);
+				break;
 #endif
 #ifdef WITH_FFMPEG
-	case R_FFMPEG:
-		makeffmpegstring(file);
-		break;
+		case R_FFMPEG:
+			makeffmpegstring(file);
+			break;
 #endif
-	default:
-		makeavistring(&G.scene->r, file);
-		break;
-	}
-	if(BLI_exist(file)) {
-		run_playanim(file);
+		default:
+			makeavistring(&G.scene->r, file);
+			break;
+		}
+		if(BLI_exist(file)) {
+			run_playanim(file);
+		}
+		else error("Can't find movie: %s", file);
 	}
 	else {
 		BKE_makepicstring(file, G.scene->r.sfra);