Blender Git Loki
Git Commits -> Revision a5e4bfb
November 11, 2016, 02:17 (GMT) |
Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising Conflicts: intern/cycles/blender/blender_python.cpp intern/cycles/device/device_opencl.cpp intern/cycles/kernel/kernel_accumulate.h intern/cycles/kernel/kernel_path.h intern/cycles/kernel/kernel_path_branched.h intern/cycles/kernel/kernel_path_surface.h intern/cycles/kernel/kernel_types.h intern/cycles/kernel/svm/svm_displace.h |
Commit Details:
Full Hash: a5e4bfb807aa1363c49625cb6c4d2a0f7b9db968
Parent Commits: 9107378, a1aa3a8