Blender Git Loki

Git Commits -> Revision 6326229

April 1, 2019, 13:01 (GMT)
Merge remote-tracking branch 'origin' into cycles_adaptive_sampling

# Conflicts:
# intern/cycles/device/opencl/opencl_base.cpp
# intern/cycles/device/opencl/opencl_mega.cpp
# intern/cycles/kernel/kernels/opencl/kernel.cl

Commit Details:

Full Hash: 632622918b9ee39edc505fffc76f6ca9ddb82434
Parent Commit: d158e4d
Lines Changed: +140, -31

6 Modified Paths:

/intern/cycles/device/device_cpu.cpp (+12, -0) (Diff)
/intern/cycles/device/device_cuda.cpp (+16, -1) (Diff)
/intern/cycles/kernel/kernels/cuda/kernel.cu (+21, -0) (Diff)
/intern/cycles/kernel/kernel_adaptive_sampling.h (+87, -0) (Diff)
/intern/cycles/kernel/kernel_passes.h (+1, -1) (Diff)
/intern/cycles/render/buffers.cpp (+3, -29) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021