Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T58183: crash with CPU + GPU rendering after profiling changes.

Browse Source 
Multi-device was not passing along profiler to the CPU.
This commit is contained in:
Brecht Van Lommel
2018-11-29 23:30:17 +01:00
parent 8ac2d85d2f
commit a8b8da5567
18 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/test/render_graph_finalize_test.cpp
View File

@@ -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);
}