diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-10-24 15:18:22 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-10-24 15:18:22 +0300 |
| commit | da8f5d6eac58f18193fdfd22e35fee5e1a13f12b (patch) | |
| tree | 94733c37facafbb2100721cc1242c77cce95c1bf /intern/cycles/graph | |
| parent | 14a55bc059e40ae72021262510e8c0942e4cc89f (diff) | |
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.
Diffstat (limited to 'intern/cycles/graph')
| -rw-r--r-- | intern/cycles/graph/node_type.h | 4 |
1 files changed, 2 insertions, 2 deletions
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); |