Blender Git Loki
Git Commits -> Revision 5036677
Revision 5036677 by Jason Wilkins (soc-2014-viewport_fx) July 10, 2014, 23:18 (GMT) |
Merge remote-tracking branch 'origin' into soc-2014-viewport_fx Conflicts: source/blender/gpu/shaders/gpu_shader_simple_vert.glsl |
Commit Details:
Full Hash: 50366779e60a46611e82be614f10a745d3c7cb5e
Parent Commits: 1d8739b, 49c73f2