Blender Git Loki

Blender Git "asset-experiments" branch commits.

Page: 37 / 54

April 27, 2015, 16:25 (GMT)
Merge branch 'asset-experiments' into asset-engine
April 27, 2015, 16:21 (GMT)
Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenkernel/intern/object.c
source/blender/windowmanager/intern/wm_operators.c
April 18, 2015, 10:20 (GMT)
Merge branch 'asset-experiments' into asset-engine
April 18, 2015, 10:05 (GMT)
Merge branch 'master' into asset-experiments
April 16, 2015, 16:28 (GMT)
WIP work to pass asset data to operator.

Asset engine ID, asset/variant/revision uuids, root path...
First goal is link code!
April 16, 2015, 12:55 (GMT)
Merge branch 'asset-experiments' into asset-engine
April 16, 2015, 12:49 (GMT)
Merge branch 'master' into asset-experiments
April 16, 2015, 08:46 (GMT)
Merge branch 'asset-experiments' into asset-engine
April 16, 2015, 08:45 (GMT)
Merge branch 'master' into asset-experiments
April 15, 2015, 17:21 (GMT)
Merge branch 'asset-experiments' into asset-engine
April 15, 2015, 17:18 (GMT)
Merge branch 'master' into asset-experiments
April 15, 2015, 17:17 (GMT)
Rename RNA's 'IDPreview' to 'Preview' - there is no reason to keep that for IDs only,
we likely will want to use it in other cases...
April 15, 2015, 15:48 (GMT)
Merge branch 'asset-experiments' into asset-engine

Conflicts:
source/blender/editors/space_file/filelist.c
April 15, 2015, 15:43 (GMT)
FileBrowser: only generate size/date/time strings when needed!

Also, cleanup remaining cruft from modes/owner stuff.
April 15, 2015, 14:45 (GMT)
Merge branch 'asset-experiments' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/makesrna/intern/rna_space.c
April 15, 2015, 14:40 (GMT)
Backport some changes from asset-engine branch:

* uuids as int[4] instead of char[16];
* move use_library_browsing to params instead of spacefile.
April 15, 2015, 14:26 (GMT)
AssetEngine: Various fixes and new features:

* Let asset engine draw most of header bar itself!
* Pass whole FileSelectParams to AE's sort_filter function.
* Move 'use_library_browsing' to params level (this way AE's sort_filter can be ware of it too).

Amber:
* Now supports real basic sorting/filtering modes
* Also basic support of tags (needs a way to refresh though, currently).
April 15, 2015, 10:50 (GMT)
Switch definitively to int32[4] for uuid's, mixing mixing it with char[16] is confusing at least.

This is only on human-level anyway... And endianess should not be an issue
either, hopefully, that way!
April 15, 2015, 10:23 (GMT)
Merge branch 'asset-experiments' into asset-engine
April 15, 2015, 10:20 (GMT)
Merge branch 'master' into asset-experiments
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021