Blender Git Commit Log

Merge branch 'id_override_static' into asset-engine

Conflicts:
source/blender/blenkernel/intern/library_remap.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_ID.c