Commit: eb9784dea21a77abbdbe28c7d35890a1ca71a2eb Author: Bastien Montagne Date: Wed Apr 15 17:48:26 2015 +0200 Branches: asset-engine https://developer.blender.org/rBeb9784dea21a77abbdbe28c7d35890a1ca71a2eb
Merge branch 'asset-experiments' into asset-engine Conflicts: source/blender/editors/space_file/filelist.c =================================================================== =================================================================== diff --cc source/blender/editors/space_file/filelist.c index 9f2f3b5,71f4d37..e76723c --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@@ -1361,39 -1378,26 +1361,37 @@@ void filelist_clear_refresh(struct File filelist->force_refresh = false; } + +static FileDirEntry *filelist_file_create_entries_block(FileList *filelist, const int index, const int size); + static FileDirEntry *filelist_file_create_entry(FileList *filelist, const int index) { - FileListInternEntry *entry = filelist->filelist_intern.filtered[index]; FileDirEntry *ret; - FileDirEntryRevision *rev; - ret = MEM_callocN(sizeof(*ret), __func__); - rev = MEM_callocN(sizeof(*rev), __func__); + if (filelist->ae) { + ret = filelist_file_create_entries_block(filelist, index, 1); - rev->size = (uint64_t)entry->st.st_size; + BLI_assert(!ret || !ret->next); + } + else { + FileListInternEntry *entry = filelist->filelist_intern.filtered[index]; + FileDirEntryRevision *rev; - rev->time = (int64_t)entry->st.st_mtime; + ret = MEM_callocN(sizeof(*ret), __func__); + rev = MEM_callocN(sizeof(*rev), __func__); - ret->entry = rev; - ret->relpath = BLI_strdup(entry->relpath); - ret->name = BLI_strdup(entry->name); - ret->description = BLI_strdupcat(filelist->filelist.root, entry->relpath); - memcpy(ret->uuid, entry->uuid, sizeof(ret->uuid)); - ret->blentype = entry->blentype; - ret->typeflag = entry->typeflag; + rev->size = (uint64_t)entry->st.st_size; - BLI_filelist_entry_size_to_string(&entry->st, rev->size_str); + + rev->time = (int64_t)entry->st.st_mtime; - BLI_filelist_entry_datetime_to_string(&entry->st, rev->time_str, rev->date_str); + + ret->entry = rev; + ret->relpath = BLI_strdup(entry->relpath); + ret->name = BLI_strdup(entry->name); + ret->description = BLI_strdupcat(filelist->filelist.root, entry->relpath); + memcpy(ret->uuid, entry->uuid, sizeof(ret->uuid)); + ret->blentype = entry->blentype; + ret->typeflag = entry->typeflag; + } BLI_addtail(&filelist->filelist.entries, ret); return ret; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs