diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-11-25 09:59:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-11-25 09:59:10 +0400 |
| commit | d45ea33ff14b7feaae29fe992b4d20cb96a1f48e (patch) | |
| tree | 3049c37522926335d8c70ab46e7c132ac5040b3d /source/blender/quicktime | |
| parent | 8cb02561a90bffa019cece9a4976ea98363c5b75 (diff) | |
Fix T37591: 'Extensions' option ignored for movies.
Diffstat (limited to 'source/blender/quicktime')
| -rw-r--r-- | source/blender/quicktime/apple/qtkit_export.m | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/source/blender/quicktime/apple/qtkit_export.m b/source/blender/quicktime/apple/qtkit_export.m index 8cf91e44c77..0c193df3861 100644 --- a/source/blender/quicktime/apple/qtkit_export.m +++ b/source/blender/quicktime/apple/qtkit_export.m @@ -242,14 +242,17 @@ void filepath_qt(char *string, RenderData *rd) BLI_path_abs(string, G.main->name); BLI_make_existing_file(string); - - if (!BLI_testextensie(string, ".mov")) { - /* if we don't have any #'s to insert numbers into, use 4 numbers by default */ - if (strchr(string, '#')==NULL) - strcat(string, "####"); /* 4 numbers */ - BLI_path_frame_range(string, rd->sfra, rd->efra, 4); - strcat(string, ".mov"); + if (rd->scemode & R_EXTENSION) { + if (!BLI_testextensie(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); + } } } |