diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-09-13 12:45:20 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-13 12:45:20 +0400 |
| commit | 7fb3de281dbb6bf252621846c11fecafffe5507a (patch) | |
| tree | e52d513a56d6c36110a3db01c3bb57191b8d16f0 /source/blender/blenkernel | |
| parent | 29cbf93b075c9be2fb635450e8ce55a474ec0e18 (diff) | |
change NODE_TREE_TYPES_BEGIN/END macros to include braces (matches CTX_DATA_BEGIN/END)
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index a9d06ad6512..afa0deebf3f 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -337,7 +337,7 @@ struct GHashIterator *ntreeTypeGetIterator(void); #define NODE_TREE_TYPES_END \ } \ BLI_ghashIterator_free(__node_tree_type_iter__); \ -} +} (void)0 void ntreeSetTypes(const struct bContext *C, struct bNodeTree *ntree); diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index ee5b11d3beb..dc1eb1cc4f6 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -3574,11 +3574,13 @@ void free_nodesystem(void) } if (nodetreetypes_hash) { - NODE_TREE_TYPES_BEGIN(nt) + NODE_TREE_TYPES_BEGIN (nt) + { if (nt->ext.free) { nt->ext.free(nt->ext.data); } - NODE_TREE_TYPES_END + } + NODE_TREE_TYPES_END; BLI_ghash_free(nodetreetypes_hash, NULL, ntree_free_type); nodetreetypes_hash = NULL; |