From cde18cf3b349a3a4d3b435fd3f76e5304ee446d6 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 24 Oct 2016 13:43:55 +0200 Subject: Cycles: Fix static initialization order fiasco Initialization order of global stats and node types was not strictly defined and it was possible to have node types initialized first and stats after that. This will zero out memory which was allocated from the statistics causing assert failure when de-initializing node types. --- intern/cycles/util/util_stats.h | 3 +++ 1 file changed, 3 insertions(+) (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 ce27067dc5e..b970b017270 100644 --- a/intern/cycles/util/util_stats.h +++ b/intern/cycles/util/util_stats.h @@ -23,7 +23,10 @@ CCL_NAMESPACE_BEGIN class Stats { public: + enum static_init_t { static_init = 0 }; + Stats() : mem_used(0), mem_peak(0) {} + explicit Stats(static_init_t) {} void mem_alloc(size_t size) { atomic_add_z(&mem_used, size); -- cgit v1.2.3