Blender Git Commit Log

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenkernel/BKE_icons.h
source/blender/blenkernel/intern/icons.c
source/blender/editors/include/UI_interface_icons.h
source/blender/editors/interface/interface_icons.c
source/blender/makesrna/intern/rna_ID.c