Blender Git Loki
Git Commits -> Revision 493a8d5
Revision 493a8d5 by Lukas Stockner (temp-cycles-microdisplacement) May 7, 2016, 22:19 (GMT) |
Merge remote-tracking branch 'origin/master' into temp-cycles-microdisplacement Conflicts: intern/cycles/render/nodes.cpp |
Commit Details:
Full Hash: 493a8d572d795c95a75398990bb0a9588f48efae
Parent Commits: d9ec0b1, e5b4e6b