diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-21 19:11:03 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-21 19:11:03 +0400 |
commit | b56aabf815dd60827da81574501ea1d12ce3a38b (patch) | |
tree | c8e49d9265437377584cb28705a2dc466a7faa1e /source/blender/editors/space_file | |
parent | 8765dfccf725770007e3b4e6b24199fe8377df71 (diff) |
style cleanup: multi-line if statements.
Diffstat (limited to 'source/blender/editors/space_file')
-rw-r--r-- | source/blender/editors/space_file/file_draw.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_file/filelist.c | 28 |
2 files changed, 17 insertions, 14 deletions
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index 87f32fe4eb8..193fa2d2c65 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -155,8 +155,7 @@ void file_draw_buttons(const bContext *C, ARegion *ar) btn_margin + UI_GetStringWidth(params->title)); } - if (available_w <= loadbutton + separator + input_minw - || params->title[0] == 0) { + if (available_w <= loadbutton + separator + input_minw || params->title[0] == 0) { loadbutton = 0; } else { diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index d7c4056431f..45a271cc7e9 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -767,16 +767,18 @@ static int file_extension_type(const char *relname) else if (BLI_testextensie(relname, ".py")) { return PYSCRIPTFILE; } - else if (BLI_testextensie(relname, ".txt") - || BLI_testextensie(relname, ".glsl") - || BLI_testextensie(relname, ".data")) { + else if (BLI_testextensie(relname, ".txt") || + BLI_testextensie(relname, ".glsl") || + BLI_testextensie(relname, ".data")) + { return TEXTFILE; } - else if ( BLI_testextensie(relname, ".ttf") - || BLI_testextensie(relname, ".ttc") - || BLI_testextensie(relname, ".pfb") - || BLI_testextensie(relname, ".otf") - || BLI_testextensie(relname, ".otc")) { + else if (BLI_testextensie(relname, ".ttf") || + BLI_testextensie(relname, ".ttc") || + BLI_testextensie(relname, ".pfb") || + BLI_testextensie(relname, ".otf") || + BLI_testextensie(relname, ".otc")) + { return FTFONTFILE; } else if (BLI_testextensie(relname, ".btx")) { @@ -785,8 +787,9 @@ static int file_extension_type(const char *relname) else if (BLI_testextensie(relname, ".dae")) { return COLLADAFILE; } - else if (BLI_testextensie_array(relname, imb_ext_image) - || (G.have_quicktime && BLI_testextensie_array(relname, imb_ext_image_qt))) { + else if (BLI_testextensie_array(relname, imb_ext_image) || + (G.have_quicktime && BLI_testextensie_array(relname, imb_ext_image_qt))) + { return IMAGEFILE; } else if (BLI_testextensie_array(relname, imb_ext_movie)) { @@ -838,8 +841,9 @@ static void filelist_setfiletypes(struct FileList* filelist) } file->flags = file_extension_type(file->relname); - if (filelist->filter_glob - && BLI_testextensie_glob(file->relname, filelist->filter_glob)) { + if (filelist->filter_glob && + BLI_testextensie_glob(file->relname, filelist->filter_glob)) + { file->flags= OPERATORFILE; } |