[Bf-blender-cvs] [da8f5d6] master: Cycles: Don't use guarded vector for statically initialized data

Sergey Sharybin noreply at git.blender.org
Mon Oct 24 14:19:29 CEST 2016


Commit: da8f5d6eac58f18193fdfd22e35fee5e1a13f12b
Author: Sergey Sharybin
Date:   Mon Oct 24 14:18:22 2016 +0200
Branches: master
https://developer.blender.org/rBda8f5d6eac58f18193fdfd22e35fee5e1a13f12b

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




More information about the Bf-blender-cvs mailing list