diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 07:46:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-30 07:49:06 +0300 |
| commit | a760e73dcf6f0a0da901359d1456ad5ca180ebeb (patch) | |
| tree | 9e0be802377a153e8d6fc37b2eec163be6ff5d12 /source/blender/blenkernel/intern/node.c | |
| parent | a687d98e67823932f95bc3c1b1452109282a3e41 (diff) | |
| parent | 6429e6c91ef4422083ed56b068dea636a322fe12 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 183fa37f84b..04cc58f373f 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -229,7 +229,7 @@ static void update_typeinfo(Main *bmain, const struct bContext *C, bNodeTreeType if (!bmain) return; - FOREACH_NODETREE(bmain, ntree, id) { + FOREACH_NODETREE_BEGIN(bmain, ntree, id) { bNode *node; bNodeSocket *sock; @@ -260,7 +260,7 @@ static void update_typeinfo(Main *bmain, const struct bContext *C, bNodeTreeType if (socktype && STREQ(sock->idname, socktype->idname)) node_socket_set_typeinfo(ntree, sock, unregister ? NULL : socktype); } - FOREACH_NODETREE_END + FOREACH_NODETREE_END; } /* Try to initialize all typeinfo in a node tree. @@ -921,7 +921,7 @@ bNode *nodeAddStaticNode(const struct bContext *C, bNodeTree *ntree, int type) { const char *idname = NULL; - NODE_TYPES_BEGIN(ntype) + NODE_TYPES_BEGIN(ntype) { /* do an extra poll here, because some int types are used * for multiple node types, this helps find the desired type */ @@ -929,7 +929,7 @@ bNode *nodeAddStaticNode(const struct bContext *C, bNodeTree *ntree, int type) idname = ntype->idname; break; } - NODE_TYPES_END + } NODE_TYPES_END; if (!idname) { printf("Error: static node type %d undefined\n", type); return NULL; @@ -2991,13 +2991,13 @@ static void ntree_validate_links(bNodeTree *ntree) void ntreeVerifyNodes(struct Main *main, struct ID *id) { - FOREACH_NODETREE(main, ntree, owner_id) { + FOREACH_NODETREE_BEGIN(main, ntree, owner_id) { bNode *node; for (node = ntree->nodes.first; node; node = node->next) if (node->typeinfo->verifyfunc) node->typeinfo->verifyfunc(ntree, node, id); - } FOREACH_NODETREE_END + } FOREACH_NODETREE_END; } void ntreeUpdateTree(Main *bmain, bNodeTree *ntree) @@ -3645,23 +3645,23 @@ void init_nodesystem(void) void free_nodesystem(void) { if (nodetypes_hash) { - NODE_TYPES_BEGIN(nt) + NODE_TYPES_BEGIN(nt) { if (nt->ext.free) { nt->ext.free(nt->ext.data); } - NODE_TYPES_END + } NODE_TYPES_END; BLI_ghash_free(nodetypes_hash, NULL, node_free_type); nodetypes_hash = NULL; } if (nodesockettypes_hash) { - NODE_SOCKET_TYPES_BEGIN(st) + NODE_SOCKET_TYPES_BEGIN(st) { if (st->ext_socket.free) st->ext_socket.free(st->ext_socket.data); if (st->ext_interface.free) st->ext_interface.free(st->ext_interface.data); - NODE_SOCKET_TYPES_END + } NODE_SOCKET_TYPES_END; BLI_ghash_free(nodesockettypes_hash, NULL, node_free_socket_type); nodesockettypes_hash = NULL; @@ -3683,7 +3683,7 @@ void free_nodesystem(void) /* -------------------------------------------------------------------- */ -/* NodeTree Iterator Helpers (FOREACH_NODETREE) */ +/* NodeTree Iterator Helpers (FOREACH_NODETREE_BEGIN) */ void BKE_node_tree_iter_init(struct NodeTreeIterStore *ntreeiter, struct Main *bmain) { |