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/util/util_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/util/util_stats.h')
-rw-r--r-- | intern/cycles/util/util_stats.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/intern/cycles/util/util_stats.h b/intern/cycles/util/util_stats.h index 1128bc3ced1..f1f2df94e33 100644 --- a/intern/cycles/util/util_stats.h +++ b/intern/cycles/util/util_stats.h @@ -41,8 +41,6 @@ public: size_t mem_used; size_t mem_peak; - - Profiler profiler; }; CCL_NAMESPACE_END |