Blender Git Loki
Git Commits -> Revision e7ac595
November 25, 2019, 17:11 (GMT) |
Merge branch 'asset-uuid' into asset-engine Conflicts: source/blender/blenkernel/BKE_asset_engine.h source/blender/blenkernel/intern/asset_engine.c source/blender/blenloader/BLO_readfile.h source/blender/makesdna/DNA_ID.h source/blender/makesdna/DNA_space_types.h source/blender/makesrna/RNA_access.h source/blender/makesrna/intern/rna_ID.c source/blender/makesrna/intern/rna_asset.c |
Commit Details:
Full Hash: e7ac5954c9e1c800af07eacc68b31411425d13ab
Parent Commits: a05cc48, bc13ceb