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.
2016-10-24 13:43:55 +02:00
parent 963aa7e270
commit cde18cf3b3
2 changed files with 4 additions and 1 deletions
--- a/intern/cycles/util/util_guarded_allocator.cpp
+++ b/intern/cycles/util/util_guarded_allocator.cpp
@@ -19,7 +19,7 @@

 CCL_NAMESPACE_BEGIN

-static Stats global_stats;
+static Stats global_stats(Stats::static_init);

 /* Internal API. */