diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 17:18:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 17:18:15 +0300 |
| commit | 56173e512cab020a5bc96e6d3069641a03d47fbe (patch) | |
| tree | 112fcb93a1898fadb34c2b74ae32471a6364a969 /source/blender/render | |
| parent | 6855d537e3112f7ba4d84524d06a524b0ea9f7b1 (diff) | |
| parent | a0a1fc89387f0f1396b5e4320c2dd4a6fedd1c25 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 4 | ||||
| -rw-r--r-- | source/blender/render/intern/source/render_result.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 8ecfe801d70..55fb43b9a3e 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2157,7 +2157,7 @@ bool RE_WriteRenderViewsImage(ReportList *reports, RenderResult *rr, Scene *scen ImageFormatData imf = rd->im_format; imf.imtype = R_IMF_IMTYPE_JPEG90; - if (BLI_testextensie(name, ".exr")) + if (BLI_path_extension_check(name, ".exr")) name[strlen(name) - 4] = 0; BKE_image_path_ensure_ext_from_imformat(name, &imf); @@ -2212,7 +2212,7 @@ bool RE_WriteRenderViewsImage(ReportList *reports, RenderResult *rr, Scene *scen ImageFormatData imf = rd->im_format; imf.imtype = R_IMF_IMTYPE_JPEG90; - if (BLI_testextensie(name, ".exr")) + if (BLI_path_extension_check(name, ".exr")) name[strlen(name) - 4] = 0; BKE_image_path_ensure_ext_from_imformat(name, &imf); diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index e0cacdf4b8f..c259a60cda0 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -1227,7 +1227,7 @@ static void render_result_exr_file_cache_path(Scene *sce, const char *root, char const char *blendfile_path = BKE_main_blendfile_path_from_global(); if (blendfile_path[0] != '\0') { BLI_split_dirfile(blendfile_path, dirname, filename, sizeof(dirname), sizeof(filename)); - BLI_replace_extension(filename, sizeof(filename), ""); /* strip '.blend' */ + BLI_path_extension_replace(filename, sizeof(filename), ""); /* strip '.blend' */ BLI_hash_md5_buffer(blendfile_path, strlen(blendfile_path), path_digest); } else { |