Blender Git Commit Log
Git Commits -> Revision 232fb32
Revision 232fb32 by Nicholas Bishop (cycles-ptex-49) February 10, 2015, 17:37 (GMT) |
Merge remote-tracking branch 'origin/master' into cycles-ptex-49 Conflicts: intern/cycles/kernel/kernel_types.h intern/cycles/render/attribute.cpp |
Commit Details:
Full Hash: 232fb32187b05af1baec035c99cb943d1670a593
Parent Commits: 27b23c3, a9c5d0b