Blender Git Commit Log

Merge branch 'master' into asset-engine

Note: reworking filebrowser UI is still TODO.

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/include/ED_fileselect.h
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_view3d/space_view3d.c