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/render/stats.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'intern/cycles/render/stats.cpp') diff --git a/intern/cycles/render/stats.cpp b/intern/cycles/render/stats.cpp index 9a7c5a6c1ad..4245745944d 100644 --- a/intern/cycles/render/stats.cpp +++ b/intern/cycles/render/stats.cpp @@ -227,12 +227,10 @@ RenderStats::RenderStats() { has_profiling = false; } -void RenderStats::collect_profiling(Scene *scene, Stats *stats) +void RenderStats::collect_profiling(Scene *scene, Profiler& prof) { has_profiling = true; - Profiler &prof = stats->profiler; - kernel = NamedNestedSampleStats("Total render time", prof.get_event(PROFILING_UNKNOWN)); kernel.add_entry("Ray setup", prof.get_event(PROFILING_RAY_SETUP)); -- cgit v1.2.3