From a8b8da55672c2177c55709321df3514355b513f4 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 29 Nov 2018 23:30:17 +0100 Subject: Fix T58183: crash with CPU + GPU rendering after profiling changes. Multi-device was not passing along profiler to the CPU. --- intern/cycles/test/render_graph_finalize_test.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'intern/cycles/test/render_graph_finalize_test.cpp') 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); } -- cgit v1.2.3