Blender Git Loki

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

Merge branch 'master' into asset-engine

Update Amber & generic Asset Engine code for changes in 2.8.

Many noisy changes in past 6 months... ;)

Merge branch 'master' into asset-engine

Merge branch 'master' into asset-engine

Conflicts:
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_space_types.h

Merge branch 'master' into asset-engine

Rather painful, too much cleanup/renamings in between...

Note that this is not currently functionnal, builds but does not show
AEs in filebrowser selector for some reason. No time to track that now.

Conflicts:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filelist.h
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_script/script_edit.c
source/blender/editors/space_script/script_intern.h
source/blender/editors/space_script/script_ops.c
source/blender/makesrna/intern/rna_internal.h
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_files_link.c

Merge branch 'blender2.8' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_280.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/include/UI_interface.h
source/blender/editors/space_view3d/space_view3d.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_dragdrop.c
source/blender/windowmanager/intern/wm_files_link.c

Merge branch 'blender2.8' into asset-engine

Merge branch 'blender2.8' into asset-engine

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenloader/intern/versioning_280.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/windowmanager/WM_api.h

Fix broken Amber after Group -> Collection change.

Merge branch 'blender2.8' into asset-engine

Conflicts:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_intern.h
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_space.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_files_link.c
source/blender/windowmanager/intern/wm_init_exit.c

Merge branch 'blender2.8' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_info.py
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_280.c
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_space.c
source/blender/windowmanager/intern/wm_files_link.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Merge branch 'blender2.8' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py

Typo

Merge branch 'blender2.8' into asset-engine

Fix again 'auto override' system.

Got lost in big undo refactor.

Note that this is probably (maybe) not how we want to have it in the
end, things like EditMode undo should probably not trigger this check?

Merge branch 'blender2.8' into asset-engine

Merge branch 'blender2.8' into asset-engine

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

Merge branch 'blender2.8' into asset-engine

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