[Bf-blender-cvs] [e8299c8] blender-v2.78-release: Cycles: Don't use guarded vector for statically initialized data

[Sergey Sharybin]

Commit: e8299c81006aba1e4b926c24276ce09d70435371
Author: Sergey Sharybin
Date:   Mon Oct 24 14:18:22 2016 +0200
Branches: blender-v2.78-release
https://developer.blender.org/rBe8299c81006aba1e4b926c24276ce09d70435371

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.

===================================================================

M	intern/cycles/graph/node_type.h

===================================================================

diff --git a/intern/cycles/graph/node_type.h b/intern/cycles/graph/node_type.h
index e89bb5b..1fb135f 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);