Blender Git Loki
Git Commits -> Revision a1447e9
Revision a1447e9 by Lukas Stockner (temp-cycles-microdisplacement) May 12, 2016, 16:00 (GMT) |
Merge remote-tracking branch 'origin/master' into temp-cycles-microdisplacement Conflicts: intern/cycles/kernel/kernel_globals.h |
Commit Details:
Full Hash: a1447e96be65e33374bcec5df5dc6b88b4349b92
Parent Commits: 3c85e1c, 493a8d5