From b839a5d0765bd449fb4f3a58ed683ec0233a8acf Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 7 Mar 2020 00:13:03 +1100 Subject: Cleanup: remove BLI_cleanup_file In practice, references to files rarely have trailing slashes (by accident). Remove this function in favor of BLI_cleanup_path. --- source/blender/freestyle/intern/application/Controller.cpp | 2 +- source/blender/freestyle/intern/system/StringUtils.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/freestyle') diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp index ef05d0a3a8f..c852cda6c8c 100644 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -347,7 +347,7 @@ int Controller::LoadMesh(Render *re, ViewLayer *view_layer, Depsgraph *depsgraph soc string basename((const char *)qfi.fileName().toAscii().data()); char cleaned[FILE_MAX]; BLI_strncpy(cleaned, iFileName, FILE_MAX); - BLI_cleanup_file(NULL, cleaned); + BLI_cleanup_path(NULL, cleaned); string basename = string(cleaned); #endif diff --git a/source/blender/freestyle/intern/system/StringUtils.cpp b/source/blender/freestyle/intern/system/StringUtils.cpp index 5e56dba17bf..23f454c0a04 100644 --- a/source/blender/freestyle/intern/system/StringUtils.cpp +++ b/source/blender/freestyle/intern/system/StringUtils.cpp @@ -46,7 +46,7 @@ void getPathName(const string &path, const string &base, vector &pathnam dir = path.substr(pos, sep - pos); BLI_strncpy(cleaned, dir.c_str(), FILE_MAX); - BLI_cleanup_file(NULL, cleaned); + BLI_cleanup_path(NULL, cleaned); res = string(cleaned); if (!base.empty()) { -- cgit v1.2.3