Blender Git Loki

Blender Git "asset-engine" branch commits.

Page: 57 / 79

June 17, 2015, 12:28 (GMT)
Merge branch 'asset-experiments' into asset-engine
June 17, 2015, 12:28 (GMT)
Merge branch 'master' into asset-experiments
June 16, 2015, 16:11 (GMT)
Merge branch 'asset-experiments' into asset-engine

Conflicts:
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filelist.h
source/blender/editors/space_file/space_file.c
June 16, 2015, 15:32 (GMT)
Cleanup: get rid of ugly bool in structs, replaced by bitflags.
June 16, 2015, 14:59 (GMT)
Make selection & co really working even during listing process.

This commit replaces `filelist_numfiles()` by `filelist_files_ensure()`. The later
also returns number of visible files (i.e. filtered ones), but also ensures filelist
is filetered and sorted.

Otherwise, during listing process, operators could be executed between an update of the listing job,
and the refresh from the file space - i.e. at a time filelist is virtually empty (from filebrowser PoV).

Also, got rid of 'need_refresh', this ended up being unused...
June 16, 2015, 14:19 (GMT)
Selection/UUIDs handling enhancements:

* Do not systematically clear selection_state's uuids GHash when updating filelist
during listing process - uuids used here should remain valid.
Allows to not lose selections during listing background job!
* Use new BLI_ghash_lookup_p to handle selection state setting, symbolic optimization but...
June 16, 2015, 13:45 (GMT)
Make imbuf_thumb for .blend a bit less stupid & noisy regarding missing previews.

A file which does not have *any* preview is perfectly valid, error is only when there
are some previews, but not the same number as actual datablocks...
June 16, 2015, 13:40 (GMT)
Fix some fileops operators that could try to get out-of-bound indices.

Also, some minor reordering in full-block-recaching, currently could not create
issues but better be safe & logic here.
June 16, 2015, 12:24 (GMT)
Merge branch 'master' into asset-experiments

Conflicts:
source/blender/editors/space_file/file_ops.c
June 12, 2015, 08:43 (GMT)
Merge branch 'asset-experiments' into asset-engine
June 12, 2015, 08:42 (GMT)
Merge branch 'master' into asset-experiments

Conflicts:
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/filelist.c
June 11, 2015, 18:17 (GMT)
Merge branch 'asset-experiments' into asset-engine

Conflicts:
source/blender/editors/space_file/filelist.c
June 11, 2015, 18:07 (GMT)
Merge branch 'master' into asset-experiments

Conflicts:
source/blender/editors/space_file/file_ops.c
June 11, 2015, 17:58 (GMT)
Fix/adapt new 'keyboard select' code to changes from branch.
June 11, 2015, 16:16 (GMT)
Merge branch 'master' into asset-experiments

Conflicts:
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/space_file.c

NOTE: Tagged some parts in new code to be fixed, rather do that in a separate commit.
This means this commit is broken and won't compile.
June 11, 2015, 14:35 (GMT)
Merge branch 'asset-experiments' into asset-engine
June 11, 2015, 14:31 (GMT)
Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenkernel/intern/idcode.c
June 3, 2015, 15:11 (GMT)
Merge branch 'asset-experiments' into asset-engine
June 3, 2015, 15:07 (GMT)
Fix error when batch-rendering preview of scene with no world.
June 3, 2015, 14:55 (GMT)
Fix bad ID preview clearing in RNA API.

Logic here was piece of crap... sigh.
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021