diff options
-rw-r--r-- | source/blender/editors/space_file/file_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/file_ops.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_file/filelist.c | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index c809b79bd61..36646d46f74 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -546,7 +546,7 @@ void file_draw_list(const bContext *C, ARegion *ar) // printf("%s: preview task: %d\n", __func__, previews_running); if (previews_running && !sfile->previews_timer) { sfile->previews_timer = WM_event_add_timer_notifier(CTX_wm_manager(C), CTX_wm_window(C), - NC_SPACE | ND_SPACE_FILE_PREVIEW, 0.01); + NC_SPACE | ND_SPACE_FILE_PREVIEW, 0.01); } if (!previews_running && sfile->previews_timer) { /* Preview is not running, no need to keep generating update events! */ diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 4e56b5b2d7d..e1a0ee5edd2 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -496,8 +496,8 @@ static bool file_walk_select_selection_set( { /* conditions for deselecting: initial file is selected, new file is * selected and either other_side isn't selected/found or we use fill */ - deselect = (fill || other_site == -1 || - !filelist_entry_select_index_get(files, other_site, FILE_SEL_SELECTED)); + deselect = (fill || other_site == -1 || + !filelist_entry_select_index_get(files, other_site, FILE_SEL_SELECTED)); /* don't change highlight_file here since we either want to deselect active or we want to * walk through a block of selected files without selecting/deselecting anything */ diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 9b54ad65edc..0945e521dc7 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -369,7 +369,7 @@ static int compare_direntry_generic(const FileListInternEntry *entry1, const Fil /* type is equal to stat.st_mode */ if (entry1->typeflag & FILE_TYPE_DIR) { - if (entry2->typeflag & FILE_TYPE_DIR) { + if (entry2->typeflag & FILE_TYPE_DIR) { /* If both entries are tagged as dirs, we make a 'sub filter' that shows first the real dirs, * then libs (.blend files), then categories in libs. */ if (entry1->typeflag & FILE_TYPE_BLENDERLIB) { @@ -1003,7 +1003,7 @@ static void filelist_entry_clear(FileDirEntry *entry) BLI_freelistN(&entry->variants); } - else if (entry->entry){ + else if (entry->entry) { MEM_freeN(entry->entry); } } @@ -1164,7 +1164,7 @@ static void filelist_cache_previews_push(FileList *filelist, FileDirEntry *entry if (!entry->image && !(entry->flags & FILE_ENTRY_INVALID_PREVIEW) && - (entry->typeflag & (FILE_TYPE_IMAGE | FILE_TYPE_MOVIE | FILE_TYPE_FTFONT | + (entry->typeflag & (FILE_TYPE_IMAGE | FILE_TYPE_MOVIE | FILE_TYPE_FTFONT | FILE_TYPE_BLENDER | FILE_TYPE_BLENDER_BACKUP | FILE_TYPE_BLENDERLIB))) { FileListEntryPreview *preview = MEM_mallocN(sizeof(*preview), __func__); @@ -1232,7 +1232,7 @@ static void filelist_cache_clear(FileListEntryCache *cache, size_t new_size) BLI_ghash_clear_ex(cache->misc_entries, NULL, NULL, new_size); if (new_size != cache->size) { cache->misc_entries_indices = MEM_reallocN(cache->misc_entries_indices, - sizeof(*cache->misc_entries_indices) * new_size); + sizeof(*cache->misc_entries_indices) * new_size); } copy_vn_i(cache->misc_entries_indices, new_size, -1); @@ -2368,7 +2368,7 @@ static void filelist_readjob_main_rec(struct FileList *filelist) files->entry->relpath = BLI_strdup(id->name + 2); } else { - char relname[FILE_MAX + (MAX_ID_NAME - 2) + 3]; + char relname[FILE_MAX + (MAX_ID_NAME - 2) + 3]; BLI_snprintf(relname, sizeof(relname), "%s | %s", id->lib->name, id->name + 2); files->entry->relpath = BLI_strdup(relname); } @@ -2486,7 +2486,7 @@ static void filelist_readjob_do( /* Skip... */ } else if (!is_lib && (recursion_level >= max_recursion) && - ((entry->typeflag & (FILE_TYPE_BLENDER | FILE_TYPE_BLENDER_BACKUP)) == 0)) + ((entry->typeflag & (FILE_TYPE_BLENDER | FILE_TYPE_BLENDER_BACKUP)) == 0)) { /* Do not recurse in real directories in this case, only in .blend libs. */ } |