Blender Git Loki
Git Commits -> Revision 9ae928f
Revision 9ae928f by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) December 31, 2015, 11:50 (GMT) |
Merge branch 'master' into id-remap Conflicts: source/blender/blenkernel/BKE_library.h source/blender/blenkernel/BKE_material.h |
Commit Details:
Full Hash: 9ae928ff9df0342a31614bcfa0e03559d0ba43f7
Parent Commits: 8e1fae3, f4e7fec