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.
This commit is contained in:
Sergey Sharybin
2016-10-24 14:18:22 +02:00
parent 14a55bc059
commit da8f5d6eac

View File

@@ -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);