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/util/util_stats.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'intern/cycles/util/util_stats.h') 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 -- cgit v1.2.3