April 9, 2015, 10:05 (GMT) |
Merge branch 'master' into asset-experiments Conflicts: source/blender/blenlib/intern/BLI_filelist.c source/blender/editors/space_file/filelist.c |
April 8, 2015, 12:38 (GMT) |
Merge branch 'asset-experiments' into asset-engine |
April 8, 2015, 12:38 (GMT) |
Merge branch 'master' into asset-experiments Conflicts: source/blender/editors/space_file/filelist.c |
April 8, 2015, 12:21 (GMT) |
Merge branch 'asset-experiments' into asset-engine |
April 8, 2015, 12:21 (GMT) |
Merge branch 'master' into asset-experiments Conflicts: source/blender/editors/space_file/file_draw.c source/blender/editors/space_file/filelist.c source/blender/imbuf/IMB_thumbs.h source/blender/imbuf/intern/thumbs.c source/blender/imbuf/intern/thumbs_blend.c |
April 7, 2015, 13:40 (GMT) |
Merge branch 'asset-experiments' into asset-engine |
April 7, 2015, 13:38 (GMT) |
Misc cleanup, fix previews memleak. |
April 7, 2015, 13:07 (GMT) |
Merge branch 'asset-experiments' into asset-engine |
April 7, 2015, 13:07 (GMT) |
Cleanup: get rid of preview handling in lib listing code. |
April 7, 2015, 13:00 (GMT) |
Move handling of ID blocks previews in thumbnail handler. this is mandatory, since we do not keep previews for all listed items anymore (with 10k datablocks would start to take too much mem). So we now generate (read) them from thumbnailing threaded task as any other image, has several advantages: * Quicker initial listing of data from .blend files. * Since thumbnails are cached on disk, re-generating them is rather quick. * General consistency! Note thumbnail generation of datablocks could (should!) be enhanced, right now it reads all previews for a given datatype in a file each time it has to generate a single datablock thumbnail, we should generate all of those previews in a single run. But this means handling cache dirty things (TBH_FAIL, outdating, etc.) on another level so need some more work. Also, still some memleaks issues with thumbnails, have to track those dose! |
April 7, 2015, 07:30 (GMT) |
Merge branch 'master' into asset-experiments |
April 6, 2015, 18:27 (GMT) |
Merge branch 'asset-experiments' into asset-engine Conflicts: source/blender/editors/space_file/filelist.c |
April 6, 2015, 18:23 (GMT) |
Some minor tweaks for asset-engine branch... |
April 6, 2015, 18:15 (GMT) |
Merge branch 'asset-experiments' into asset-engine Conflicts: source/blender/editors/space_file/filelist.c |
April 6, 2015, 17:51 (GMT) |
Merge branch 'master' into asset-experiments |
April 6, 2015, 17:51 (GMT) |
FileBrowser: internal listing: use own, much lighter struct to store whole list. Since with internal listing we have no choice but to list everything, store those data in the smallest possible struct - note we do not even store preview here, these are only handled in full FileDirEntry cache (re-loading them from cached thumbnails is really quick anyway). Still not complete, have to re-do ID previews now, among other things... And some memleaks again with previews, ugh. |
April 5, 2015, 13:47 (GMT) |
BLI filelist: get rid of strings for size/time/mode/etc. Those were eating quite a bit of bites, not neglectable with thousands of entries... Also, useless to print those info most of the time, they are not used! So now, we only store 'raw' stat data, and expose funcs to convert them to readable strings on demand. |
April 5, 2015, 09:49 (GMT) |
Merge branch 'master' into asset-experiments |
April 4, 2015, 13:14 (GMT) |
Resurrect `filelist_selection_get()`... Still not working though. |
April 4, 2015, 13:07 (GMT) |
Merge branch 'asset-experiments' into asset-engine |
|