diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-30 01:30:17 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-30 01:43:27 +0300 |
| commit | a8b8da55672c2177c55709321df3514355b513f4 (patch) | |
| tree | 97c730a1b39e60ecd15ad5c73b63892329daae1e /intern/cycles/test | |
| parent | 8ac2d85d2fd3f8b997e9c9bddadada0dc7bdaf37 (diff) | |
Fix T58183: crash with CPU + GPU rendering after profiling changes.
Multi-device was not passing along profiler to the CPU.
Diffstat (limited to 'intern/cycles/test')
| -rw-r--r-- | intern/cycles/test/render_graph_finalize_test.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/test/render_graph_finalize_test.cpp b/intern/cycles/test/render_graph_finalize_test.cpp index cfdab7a6433..5f60411758d 100644 --- a/intern/cycles/test/render_graph_finalize_test.cpp +++ b/intern/cycles/test/render_graph_finalize_test.cpp @@ -161,6 +161,7 @@ class RenderGraph : public testing::Test protected: ScopedMockLog log; Stats stats; + Profiler profiler; DeviceInfo device_info; Device *device_cpu; SceneParams scene_params; @@ -179,7 +180,7 @@ protected: util_logging_start(); util_logging_verbosity_set(1); - device_cpu = Device::create(device_info, stats, true); + device_cpu = Device::create(device_info, stats, profiler, true); scene = new Scene(scene_params, device_cpu); } |