Blender Git Loki
Git Commits -> Revision a8b8da5
Revision a8b8da5 by Brecht Van Lommel (master) November 29, 2018, 22:43 (GMT) |
Fix T58183: crash with CPU + GPU rendering after profiling changes. Multi-device was not passing along profiler to the CPU. |
Commit Details:
Full Hash: a8b8da55672c2177c55709321df3514355b513f4
Parent Commit: 8ac2d85
Lines Changed: +64, -64
18 Modified Paths:
/intern/cycles/device/device.cpp (+6, -6) (Diff)
/intern/cycles/device/device.h (+3, -2) (Diff)
/intern/cycles/device/device_cpu.cpp (+6, -6) (Diff)
/intern/cycles/device/device_cuda.cpp (+4, -4) (Diff)
/intern/cycles/device/device_intern.h (+5, -5) (Diff)
/intern/cycles/device/device_multi.cpp (+6, -6) (Diff)
/intern/cycles/device/device_network.cpp (+4, -4) (Diff)
/intern/cycles/device/device_opencl.cpp (+3, -3) (Diff)
/intern/cycles/device/opencl/opencl.h (+3, -3) (Diff)
/intern/cycles/device/opencl/opencl_base.cpp (+2, -2) (Diff)
/intern/cycles/device/opencl/opencl_mega.cpp (+4, -4) (Diff)
/intern/cycles/device/opencl/opencl_split.cpp (+5, -5) (Diff)
/intern/cycles/render/session.cpp (+8, -7) (Diff)
/intern/cycles/render/session.h (+1, -0) (Diff)
/intern/cycles/render/stats.cpp (+1, -3) (Diff)
/intern/cycles/render/stats.h (+1, -1) (Diff)
/intern/cycles/test/render_graph_finalize_test.cpp (+2, -1) (Diff)
/intern/cycles/util/util_stats.h (+0, -2) (Diff)
/intern/cycles/device/device.h (+3, -2) (Diff)
/intern/cycles/device/device_cpu.cpp (+6, -6) (Diff)
/intern/cycles/device/device_cuda.cpp (+4, -4) (Diff)
/intern/cycles/device/device_intern.h (+5, -5) (Diff)
/intern/cycles/device/device_multi.cpp (+6, -6) (Diff)
/intern/cycles/device/device_network.cpp (+4, -4) (Diff)
/intern/cycles/device/device_opencl.cpp (+3, -3) (Diff)
/intern/cycles/device/opencl/opencl.h (+3, -3) (Diff)
/intern/cycles/device/opencl/opencl_base.cpp (+2, -2) (Diff)
/intern/cycles/device/opencl/opencl_mega.cpp (+4, -4) (Diff)
/intern/cycles/device/opencl/opencl_split.cpp (+5, -5) (Diff)
/intern/cycles/render/session.cpp (+8, -7) (Diff)
/intern/cycles/render/session.h (+1, -0) (Diff)
/intern/cycles/render/stats.cpp (+1, -3) (Diff)
/intern/cycles/render/stats.h (+1, -1) (Diff)
/intern/cycles/test/render_graph_finalize_test.cpp (+2, -1) (Diff)
/intern/cycles/util/util_stats.h (+0, -2) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021