[Bf-blender-cvs] [7b0bce1] master: Code cleanup: remove redundant filename copy & simplify splash
Campbell Barton
noreply at git.blender.org
Thu May 1 03:59:36 CEST 2014
Commit: 7b0bce19468cf83f1198145a9c6b1408b04f91a1
Author: Campbell Barton
Date: Thu May 1 11:58:08 2014 +1000
https://developer.blender.org/rB7b0bce19468cf83f1198145a9c6b1408b04f91a1
Code cleanup: remove redundant filename copy & simplify splash
===================================================================
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index a4355af..a735326 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1770,11 +1770,10 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
uiBut *but;
uiLayout *layout, *split, *col;
uiStyle *style = UI_GetStyle();
- struct RecentFile *recent;
+ const struct RecentFile *recent;
int i;
MenuType *mt = WM_menutype_find("USERPREF_MT_splash", true);
char url[96];
- char file[FILE_MAX];
#ifndef WITH_HEADLESS
extern char datatoc_splash_png[];
@@ -1914,11 +1913,10 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
uiItemL(col, IFACE_("Recent"), ICON_NONE);
for (recent = G.recent_files.first, i = 0; (i < 5) && (recent); recent = recent->next, i++) {
- BLI_split_file_part(recent->filepath, file, sizeof(file));
- if (BLO_has_bfile_extension(file))
- uiItemStringO(col, BLI_path_basename(recent->filepath), ICON_FILE_BLEND, "WM_OT_open_mainfile", "filepath", recent->filepath);
- else
- uiItemStringO(col, BLI_path_basename(recent->filepath), ICON_FILE_BACKUP, "WM_OT_open_mainfile", "filepath", recent->filepath);
+ const char *filename = BLI_path_basename(recent->filepath);
+ uiItemStringO(col, filename,
+ BLO_has_bfile_extension(filename) ? ICON_FILE_BLEND : ICON_FILE_BACKUP,
+ "WM_OT_open_mainfile", "filepath", recent->filepath);
}
uiItemS(col);
More information about the Bf-blender-cvs
mailing list