Blender Git Commit Log
Git Commits -> Revision 2ad4460
Revision 2ad4460 by Kévin Dietrich (openvdb) June 7, 2016, 10:36 (GMT) |
Merge branch 'master' into openvdb Conflicts: intern/cycles/kernel/kernel_compat_cpu.h intern/cycles/kernel/kernel_globals.h intern/cycles/kernel/osl/osl_services.cpp intern/cycles/kernel/svm/svm_types.h intern/cycles/render/svm.cpp intern/cycles/util/util_task.cpp |
Commit Details:
Full Hash: 2ad44606a1dd424a26ff7f44a151b83f7835e371
Parent Commits: 0da13ad, 75976a2