Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-10-24 15:18:22 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-10-24 15:20:27 +0300
commite8299c81006aba1e4b926c24276ce09d70435371 (patch)
treeb593f41e13cbba0bb05fc43000fc70d82975f445
parent21bf8639348bc75cd0c654f8ec5c3d110cf0ac5c (diff)
Cycles: Don't use guarded vector for statically initialized datav2.78a
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.
-rw-r--r--intern/cycles/graph/node_type.h4
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);