sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T37591: 'Extensions' option ignored for movies.

Browse Source
This commit is contained in:
Campbell Barton 2013-11-25 16:59:10 +11:00
parent 8cb02561a9
commit d45ea33ff1
5 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenkernel/intern/writeavi.c
View File

@ -132,9 +132,16 @@ static void filepath_avi(char *string, RenderData *rd)
BLI_make_existing_file(string); BLI_make_existing_file(string);
if (!BLI_testextensie(string, ".avi")) { if (rd->scemode & R_EXTENSION) {
BLI_path_frame_range(string, rd->sfra, rd->efra, 4); if (!BLI_testextensie(string, ".avi")) {
strcat(string, ".avi"); BLI_path_frame_range(string, rd->sfra, rd->efra, 4);
strcat(string, ".avi");
}
}
else {
if (BLI_path_frame_check_chars(string)) {
BLI_path_frame_range(string, rd->sfra, rd->efra, 4);
}
} }
} }

31
source/blender/blenkernel/intern/writeffmpeg.c
View File

@ -1023,23 +1023,32 @@ void BKE_ffmpeg_filepath_get(char *string, RenderData *rd)
sprintf(autosplit, "_%03d", ffmpeg_autosplit_count); sprintf(autosplit, "_%03d", ffmpeg_autosplit_count);
} }
while (*fe) { if (rd->scemode & R_EXTENSION) {
if (BLI_strcasecmp(string + strlen(string) - strlen(*fe), *fe) == 0) { while (*fe) {
break; if (BLI_strcasecmp(string + strlen(string) - strlen(*fe), *fe) == 0) {
break;
}
fe++;
} }
fe++;
}
if (*fe == NULL) { if (*fe == NULL) {
strcat(string, autosplit); strcat(string, autosplit);
BLI_path_frame_range(string, rd->sfra, rd->efra, 4); BLI_path_frame_range(string, rd->sfra, rd->efra, 4);
strcat(string, *exts); strcat(string, *exts);
}
else {
*(string + strlen(string) - strlen(*fe)) = 0;
strcat(string, autosplit);
strcat(string, *fe);
}
} }
else { else {
*(string + strlen(string) - strlen(*fe)) = 0; if (BLI_path_frame_check_chars(string)) {
BLI_path_frame_range(string, rd->sfra, rd->efra, 4);
}
strcat(string, autosplit); strcat(string, autosplit);
strcat(string, *fe);
} }
} }

1
source/blender/blenlib/BLI_path_util.h
View File

@ -158,6 +158,7 @@ bool BLI_has_parent(char *path);
bool BLI_path_abs(char *path, const char *basepath); bool BLI_path_abs(char *path, const char *basepath);
bool BLI_path_frame(char *path, int frame, int digits); bool BLI_path_frame(char *path, int frame, int digits);
bool BLI_path_frame_range(char *path, int sta, int end, int digits); bool BLI_path_frame_range(char *path, int sta, int end, int digits);
bool BLI_path_frame_check_chars(const char *path);
bool BLI_path_cwd(char *path); bool BLI_path_cwd(char *path);
void BLI_path_rel(char *file, const char *relfile); void BLI_path_rel(char *file, const char *relfile);

9
source/blender/blenlib/intern/path_util.c
View File

@ -719,6 +719,15 @@ bool BLI_path_frame_range(char *path, int sta, int end, int digits)
return false; return false;
} }
/**
* Check if we have '#' chars, usable for #BLI_path_frame, #BLI_path_frame_range
*/
bool BLI_path_frame_check_chars(const char *path)
{
int ch_sta, ch_end; /* dummy args */
return stringframe_chars(path, &ch_sta, &ch_end);
}
/** /**
* If path begins with "//", strips that and replaces it with basepath directory. Also converts * If path begins with "//", strips that and replaces it with basepath directory. Also converts
* a drive-letter prefix to something more sensible if this is a non-drive-letter-based system. * a drive-letter prefix to something more sensible if this is a non-drive-letter-based system.

17
source/blender/quicktime/apple/qtkit_export.m
View File

@ -243,13 +243,16 @@ void filepath_qt(char *string, RenderData *rd)
BLI_make_existing_file(string); BLI_make_existing_file(string);
if (!BLI_testextensie(string, ".mov")) { if (rd->scemode & R_EXTENSION) {
/* if we don't have any #'s to insert numbers into, use 4 numbers by default */ if (!BLI_testextensie(string, ".mov")) {
if (strchr(string, '#')==NULL) BLI_path_frame_range(string, rd->sfra, rd->efra, 4);
strcat(string, "####"); /* 4 numbers */ strcat(string, ".mov");
}
BLI_path_frame_range(string, rd->sfra, rd->efra, 4); }
strcat(string, ".mov"); else {
if (BLI_path_frame_check_chars(string)) {
BLI_path_frame_range(string, rd->sfra, rd->efra, 4);
}
} }
} }