Blender Git Loki

Merge branch 'cycles_memory_experiments' into gooseberry

Smoke: Fix another crash caused by recent changes

Didn't notice initFie and so are called from constructor for some reason..

Merge branch 'cycles_memory_experiments' into gooseberry

Smoke: Fix wrong bit test in previous commit

Initial import of part of work done on Preview stuff from asset-experiments branch.

Merge branch 'asset-experiments' into asset-engine

Merge branch 'master' into asset-experiments

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...

Merge branch 'asset-experiments' into asset-engine

Conflicts:
source/blender/editors/space_file/filelist.c

FileBrowser: only generate size/date/time strings when needed!

Also, cleanup remaining cruft from modes/owner stuff.

Merge branch 'cycles_memory_experiments' into gooseberry

Merge branch 'master' into cycles_memory_experiments

Draw modifiers as inactive when channel modifiers are deactivated.

Smoke: Don't allocate arrays needed for hi-res simulation if smoke is baked to file

There used to be quite huge 3D arrays stored in memory which are only needed for
simulation steps and not used at all if the smoke is baked to file. That memory
is unmanaged by blender and not visible in the info space header and in practice
they could easily be gigabytes for hires smoke.

This commit only addressed hires smoke since it's the more important at this
point, and non-hires smoke wouldn't have such noticeable benefit.

In the case of tornado file it gives around 20% memory saving (which is about
26GB vs. 33GB on later frames of 01.03.02.A3 shot.

Merge branch 'asset-experiments' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/makesrna/intern/rna_space.c

Backport some changes from asset-engine branch:

* uuids as int[4] instead of char[16];
* move use_library_browsing to params instead of spacefile.

Make icon use a dim version instead for modifier muting

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).

Add toggle that disables modifiers on fcurves. Gooseberry request, not
sure how useful it would be on master + it misses an icon, so commiting
here first.

Print additional info incase we need to split tile further