From da8f5d6eac58f18193fdfd22e35fee5e1a13f12b Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Mon, 24 Oct 2016 14:18:22 +0200
Subject: Cycles: Don't use guarded vector for statically initialized data

This will confuse hell of a guarded allocators because it is possible
to have allocation happened prior to Blender's guarded allocator is
fully initialized.

This was causing crashes and assert failures when running blender
with fully guarded memory allocator.
---
 intern/cycles/graph/node_type.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'intern/cycles')

diff --git a/intern/cycles/graph/node_type.h b/intern/cycles/graph/node_type.h
index e89bb5b3c1f..1fb135f6d22 100644
--- a/intern/cycles/graph/node_type.h
+++ b/intern/cycles/graph/node_type.h
@@ -125,8 +125,8 @@ struct NodeType
 
 	ustring name;
 	Type type;
-	vector<SocketType> inputs;
-	vector<SocketType> outputs;
+	vector<SocketType, std::allocator<SocketType> > inputs;
+	vector<SocketType, std::allocator<SocketType> > outputs;
 	CreateFunc create;
 
 	static NodeType *add(const char *name, CreateFunc create, Type type = NONE);
-- 
cgit v1.2.3