[Bf-blender-cvs] [7ad9ca7] master: Cleanup: replace BLI_split_file_part w/ BLI_path_basename

[Campbell Barton]

Commit: 7ad9ca72ddc789479e92fa4dc898740642eb04da
Author: Campbell Barton
Date:   Tue Jul 14 09:34:53 2015 +1000
Branches: master
https://developer.blender.org/rB7ad9ca72ddc789479e92fa4dc898740642eb04da

Cleanup: replace BLI_split_file_part w/ BLI_path_basename

===================================================================

M	source/blender/editors/space_info/space_info.c
M	source/blender/render/intern/source/render_result.c

===================================================================

diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c
index 062fc0c..3bebac1 100644
--- a/source/blender/editors/space_info/space_info.c
+++ b/source/blender/editors/space_info/space_info.c
@@ -282,16 +282,13 @@ static void info_header_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegi
 static void recent_files_menu_draw(const bContext *UNUSED(C), Menu *menu)
 {
 	struct RecentFile *recent;
-	char file[FILE_MAX];
 	uiLayout *layout = menu->layout;
 	uiLayoutSetOperatorContext(layout, WM_OP_EXEC_REGION_WIN);
-	if (G.recent_files.first) {
+	if (!BLI_listbase_is_empty(&G.recent_files)) {
 		for (recent = G.recent_files.first; (recent); recent = recent->next) {
-			BLI_split_file_part(recent->filepath, file, sizeof(file));
-			if (BLO_has_bfile_extension(file))
-				uiItemStringO(layout, BLI_path_basename(recent->filepath), ICON_FILE_BLEND, "WM_OT_open_mainfile", "filepath", recent->filepath);
-			else
-				uiItemStringO(layout, BLI_path_basename(recent->filepath), ICON_FILE_BACKUP, "WM_OT_open_mainfile", "filepath", recent->filepath);
+			const char *file = BLI_path_basename(recent->filepath);
+			const int icon = BLO_has_bfile_extension(file) ? ICON_FILE_BLEND : ICON_FILE_BACKUP;
+			uiItemStringO(layout, file, icon, "WM_OT_open_mainfile", "filepath", recent->filepath);
 		}
 	}
 	else {
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index cfbeb20..50acdf8 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -1323,9 +1323,9 @@ void render_result_exr_file_merge(RenderResult *rr, RenderResult *rrpart, const
 /* path to temporary exr file */
 void render_result_exr_file_path(Scene *scene, const char *layname, int sample, char *filepath)
 {
-	char name[FILE_MAXFILE + MAX_ID_NAME + MAX_ID_NAME + 100], fi[FILE_MAXFILE];
+	char name[FILE_MAXFILE + MAX_ID_NAME + MAX_ID_NAME + 100];
+	const char *fi = BLI_path_basename(G.main->name);
 	
-	BLI_split_file_part(G.main->name, fi, sizeof(fi));
 	if (sample == 0) {
 		BLI_snprintf(name, sizeof(name), "%s_%s_%s.exr", fi, scene->id.name + 2, layname);
 	}