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

Bugfix #4663

Browse Source 
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.
This commit is contained in:
Ton Roosendaal
2006-07-11 11:54:59 +00:00
parent f9461c8435
commit fede9f9be3
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/src/buttons_scene.c
View File

@@ -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);