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/blenkernel/intern/writeavi.c | |
parent | 8cb02561a90bffa019cece9a4976ea98363c5b75 (diff) |
Fix T37591: 'Extensions' option ignored for movies.
Diffstat (limited to 'source/blender/blenkernel/intern/writeavi.c')
-rw-r--r-- | source/blender/blenkernel/intern/writeavi.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c index ff6212f6b09..1d29ef70d8b 100644 --- a/source/blender/blenkernel/intern/writeavi.c +++ b/source/blender/blenkernel/intern/writeavi.c @@ -132,9 +132,16 @@ static void filepath_avi(char *string, RenderData *rd) BLI_make_existing_file(string); - if (!BLI_testextensie(string, ".avi")) { - BLI_path_frame_range(string, rd->sfra, rd->efra, 4); - strcat(string, ".avi"); + if (rd->scemode & R_EXTENSION) { + if (!BLI_testextensie(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); + } } } |