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/render/stats.cpp | |
| 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/render/stats.cpp')
| -rw-r--r-- | intern/cycles/render/stats.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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)); |