diff options
author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2020-10-09 01:11:45 +0300 |
---|---|---|
committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2020-10-09 01:15:24 +0300 |
commit | 2d5e38d4ece9074ac3ad550a130658e8a29fdac6 (patch) | |
tree | 194b7f2dc1f53343541630805cf7711c234e521a /intern | |
parent | 70634ba43855030e9229e6d5c51ca58af1728f3c (diff) |
Cycles: fix incorrect default value for node array socket type
Diffstat (limited to 'intern')
-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 69891e6a10a..3b9b3007099 100644 --- a/intern/cycles/graph/node_type.h +++ b/intern/cycles/graph/node_type.h @@ -267,8 +267,8 @@ struct NodeType { ##__VA_ARGS__) #define SOCKET_NODE_ARRAY(name, ui_name, node_type, ...) \ { \ - static Node *defval = NULL; \ - assert(SOCKET_SIZEOF(T, name) == sizeof(Node *)); \ + static array<Node *> defval = {}; \ + assert(SOCKET_SIZEOF(T, name) == sizeof(array<Node *>)); \ type->register_input(ustring(#name), \ ustring(ui_name), \ SocketType::NODE_ARRAY, \ |