Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Correction to previous commit.

Browse Source 
Mostly styling, but also str_exec would often remain undefined...
This commit is contained in:
Bastien Montagne
2015-09-16 22:23:05 +02:00
parent 4fb9cc24a8
commit 79c668dbec
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/editors/space_file/file_draw.c
View File

@@ -232,17 +232,16 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
/* Execute / cancel buttons. */
if (loadbutton) {
const struct FileDirEntry *file = sfile->files ? filelist_file(sfile->files, params->active_file) : NULL;
char const *str_exec;
if (file) {
const bool is_parent_dir = (FILENAME_IS_PARENT(file->relpath));
if (is_parent_dir){
str_exec = IFACE_("Parent Directory");
} else if (file->typeflag & FILE_TYPE_DIR) {
str_exec = IFACE_("Open Directory");
}
} else {
str_exec = params->title; /* params->title is already translated! */
if (file && FILENAME_IS_PARENT(file->relpath)){
str_exec = IFACE_("Parent Directory");
}
else if (file && file->typeflag & FILE_TYPE_DIR) {
str_exec = IFACE_("Open Directory");
}
else {
str_exec = params->title; /* params->title is already translated! */
}
uiDefButO(block, UI_BTYPE_BUT, "FILE_OT_execute", WM_OP_EXEC_REGION_WIN, str_exec,