Blender Git Loki
Git Commits -> Revision e3d1361
August 10, 2017, 15:08 (GMT) |
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 |
Commit Details:
Full Hash: e3d1361c755b76a5bfee7b457bf92b945cac95eb
Parent Commits: 3f9bea4, 4263484