Blender Git Loki

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-engine

Merge branch 'master' into id-remap

First 'working' version of asset reload.

Dead dummy simplistic test runs (nearly) OK here (only have a memleak from versionning code...),
but obviously will need much serious tests to validate everything.

Also, many things in code will need cleanup/refactor. Not to mention UI/UX.

But we do have asset version check & reload on file opening now! :D

Process summary:
I) Open .blend file exactly as in master, load assets just like any other linked data (add placeholders in case not found).
II) Check all asset engines and ask them whether each asset is OK, needs to be updated/reloaded, is missing...
III) User then can decide to actually reload the asset, or not.

Step II) happens in an async job (since engines using remote storage/database could take some time to answer),
step III) is a locking task (just like initial linking). This should allow user to not be blocked at all by that
asset update process.

Merge branch 'id-remap' into asset-experiments

Conflicts:
source/blender/blenloader/intern/readfile.c

Set a main's version to current one after do_version is done.

With current master this is not an issue, but with all the reload stuff,
a same main could end up going several time into 'do_version', which is absolutely
not desired (multi-allocations, repeating conversions over some values, etc.).

Merge branch 'master' into cycles_panorama_experiments

Merge branch 'asset-engine' into asset-experiments

Do not update asset repo info inside link code.

Whole 'database' is rebuilt later anyway, and in more complex 'asset reload' cases
(where we may actually be reloading same asset with same uuid from same lib file),
this creates confusion...

Use an enumeration for archive compression.

Merge branch 'master' into alembic_basic_io

Merge branch 'asset-engine' into asset-experiments

Add global 'asset search by uuid' helper.

Don't delete facemap widgets in hidden layers, only hide

Aaaaand some cleanup.

added new liquid script functions (mostly nb flip)

Better way of handling face map widgets in new tagging system

* On widget group init, needed widgets are created and stored in a hash table (wmWidgetGroup.customdata).
* On widget group refresh, a new hash table is created and compared to the old one. For each widget needed we check if it's already existing in the old hash table, if so it's moved to the new one, if not it gets created.
* The remaining widgets in the old hash table get completely deleted, the old hash table gets deleted, the new one is stored (wmWidgetGroup.customdata) and becomes the old one on next refresh.

Solves all issues mentioned in rB003c181a640576b (and removes quite some ugly stuff).
Did minor cleanup in overlapping parts.

Merge branch 'master' into cycles_hair_bvh

Merge branch 'master' into temp_widgets_update_tagging

Conflicts:
source/blender/editors/include/ED_transform.h
source/blender/editors/include/ED_view3d.h
source/blender/editors/screen/screen_edit.c

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/editors/include/ED_transform.h
source/blender/editors/include/ED_view3d.h
source/blender/editors/screen/screen_edit.c

Minor edits to widget-group keymap namings