Blender Git Loki
Git Commits -> Revision e782910
March 18, 2019, 19:28 (GMT) |
Merge branch 'master' into asset-engine Kinda painful merge thanks to extensive changes to things like Main listbases names, linking code, etc. Conflicts: source/blender/blenkernel/BKE_library.h source/blender/blenloader/BLO_readfile.h source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/writefile.c source/blender/makesdna/DNA_space_types.h source/blender/windowmanager/intern/wm_files_link.c |
Commit Details:
Full Hash: e782910b187dae5c573f44ec98ce25e8274a6d89
Parent Commits: b29790a, edce196