From a0a1fc89387f0f1396b5e4320c2dd4a6fedd1c25 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 17 Jun 2018 16:13:24 +0200 Subject: Cleanup: BLI path extension API Use BLI_path_extension_* prefix. --- source/blender/render/intern/source/pipeline.c | 4 ++-- source/blender/render/intern/source/render_result.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/render') diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index ea47ac34f13..2c7ef8b606a 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -3409,7 +3409,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); @@ -3464,7 +3464,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 d9e83b209b8..a79d0c3098f 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -1257,7 +1257,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 { -- cgit v1.2.3