Blender Git Loki
Git Commits -> Revision 1cd2d7b
Revision 1cd2d7b by Clément Fukhaut (pbr-viewport) April 4, 2016, 22:15 (GMT) |
Merge branch 'master' of git://git.blender.org/blender # Conflicts: # source/blender/gpu/intern/gpu_material.c # source/blender/gpu/intern/gpu_shader.c |
Commit Details:
Full Hash: 1cd2d7b744e5b42fdce8e5c7a7faaabad1b78a21
Parent Commits: 65f279b, 798357c