Blender Git Loki

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

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

Fix crash when appending/linking (double free...).

Merge branch 'master' into asset-experiments

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

Make 'recursion' work as expected.

Now, recursion 0 = previous behavior,
recursion 1 = only show content of immediate .blend files, do not recurse in actual dir hierarchy,
recursion >1 = complete recursion!

Flat listing of libs: do not show the 'categories' directories unless we are
inside a single .blend lib in this case, useless and heavily clutters space.

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

Cleanup: add 'ED_' prefix to public fsmenu functions...

Cleanup: get rid of unused stuff!

Merge branch 'master' into asset-experiments

Prepare assets UI: switch filebrowser to tools + tool props areas, instead of channels.

This will allow us to keep op panel independent, and have tabs for future assets tools!

Note 'conversion' from previous file area (channels) is not perfect, you have to hit 'T'
twice currently if you had a filebrowser in your .blend file...

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-experiments

Conflicts:
release/scripts/startup/bl_operators/wm.py

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/windowmanager/intern/wm_operators.c

Merge branch 'master' into asset-experiments

Fix filtering in new UIList bookmarks & co.

Better sorting when we are displaying several levels at once, for 'lib' append/link.

Consider blendfiles and 'categories' inside them as regular dirs, but with this hierachy:
real dir > blende file lib > category in a blend lib.

This gives a much better sorting (among other things, gives more importance to
blend files!).

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/filelist.c