Blender Git Commits

Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenloader/intern/versioning_280.c
source/blender/makesdna/DNA_ID.h

Merge branch 'master' into asset-engine

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

Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/intern/library.c

Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenloader/intern/versioning_defaults.c
source/blender/windowmanager/intern/wm_files.c

Merge branch 'master' into asset-engine

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

Merge branch 'master' into asset-engine

Conflicts:
source/blender/editors/space_file/file_ops.c
source/blender/makesrna/intern/rna_space.c
source/blender/windowmanager/WM_api.h

AssetEngines: fix memleaks in append case...

Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/space_file/space_file.c
source/blender/makesdna/DNA_space_types.h
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_files_link.c
source/blender/windowmanager/intern/wm_init_exit.c

Merge 'master' into 'asset-engine'

Merge 'master' into 'asset-engine'

Merge 'master' into 'asset-engine'

Merge 'master' into 'asset-engine'

Merge 'master' into 'asset-engine'

Merge branch 'master' into asset-engine

Merge branch 'master' into asset-engine

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

Merge branch 'master' into asset-engine

Kinda painful merge thanks to extensive changes to things like Main
listbases names, linking code, etc.

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/makesdna/DNA_space_types.h
source/blender/windowmanager/intern/wm_files_link.c

Merge branch 'master' into asset-engine

Merge branch 'master' into asset-engine

Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/BKE_global.h
source/blender/python/intern/bpy_app.c

Merge branch 'master' into asset-engine

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenloader/BLO_readfile.h
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filelist.h
source/blender/makesdna/DNA_space_types.h
source/blender/windowmanager/intern/wm_files_link.c