diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-30 01:54:30 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-30 01:54:30 +0300 |
| commit | 63c06531707c14c3c93c9f84d39a77aaf75c3634 (patch) | |
| tree | 700445b404cc5ebfa09fea62c53b9a64db049b9e /intern/cycles/util | |
| parent | 679b156756e070a779e97af7d5a34ddf0b164836 (diff) | |
| parent | a8b8da55672c2177c55709321df3514355b513f4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/util')
| -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 |