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.h | |
| 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.h')
| -rw-r--r-- | intern/cycles/render/stats.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/stats.h b/intern/cycles/render/stats.h index ce0529bb8bd..33fe1f4b185 100644 --- a/intern/cycles/render/stats.h +++ b/intern/cycles/render/stats.h @@ -144,7 +144,7 @@ public: string full_report(); /* Collect kernel sampling information from Stats. */ - void collect_profiling(Scene *scene, Stats *stats); + void collect_profiling(Scene *scene, Profiler& prof); bool has_profiling; |