Blender Git Loki
Git Commits -> Revision 050e6bd
Revision 050e6bd by YimingWu (lanpr-under-gp, lineart-bvh, lineart-shadow, temp-lineart-contained, temp_lineart_contained) June 7, 2020, 12:09 (GMT) |
Merge remote-tracking branch 'origin/master' into lanpr-under-gp # Conflicts: # source/blender/blenloader/intern/readfile.c # source/blender/blenloader/intern/writefile.c # source/blender/makesrna/intern/rna_collection.c |
Commit Details:
Full Hash: 050e6bdea7e6541d09804146b62f5df05d5c3ffa
Parent Commits: 35d83ad, 8f25cfd