diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-08 16:58:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-08 16:58:11 +0400 |
| commit | a9fb183901f7d64bf5435a28bdb454b1f800cf6a (patch) | |
| tree | e07cd7ff1e3e6e543c2986d2f1e45e4bfe7319cf /source/blender/blenkernel/BKE_node.h | |
| parent | df664fa6d54ff2bd0d8f218466985986ce522718 (diff) | |
rename BLI_ghashIterator_notDone() -> BLI_ghashIterator_done()
was renamed fairly recently but other similar iterators not negated
like this, would prefer to keep it as it was
Diffstat (limited to 'source/blender/blenkernel/BKE_node.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index d1c16cc1185..3abca094410 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -330,7 +330,7 @@ struct GHashIterator *ntreeTypeGetIterator(void); #define NODE_TREE_TYPES_BEGIN(ntype) \ { \ GHashIterator *__node_tree_type_iter__ = ntreeTypeGetIterator(); \ - for (; BLI_ghashIterator_notDone(__node_tree_type_iter__); BLI_ghashIterator_step(__node_tree_type_iter__)) { \ + for (; !BLI_ghashIterator_done(__node_tree_type_iter__); BLI_ghashIterator_step(__node_tree_type_iter__)) { \ bNodeTreeType *ntype = BLI_ghashIterator_getValue(__node_tree_type_iter__); #define NODE_TREE_TYPES_END \ @@ -406,7 +406,7 @@ struct GHashIterator *nodeTypeGetIterator(void); #define NODE_TYPES_BEGIN(ntype) \ { \ GHashIterator *__node_type_iter__ = nodeTypeGetIterator(); \ - for (; BLI_ghashIterator_notDone(__node_type_iter__); BLI_ghashIterator_step(__node_type_iter__)) { \ + for (; !BLI_ghashIterator_done(__node_type_iter__); BLI_ghashIterator_step(__node_type_iter__)) { \ bNodeType *ntype = BLI_ghashIterator_getValue(__node_type_iter__); #define NODE_TYPES_END \ @@ -426,7 +426,7 @@ const char * nodeStaticSocketInterfaceType(int type, int subtype); #define NODE_SOCKET_TYPES_BEGIN(stype) \ { \ GHashIterator *__node_socket_type_iter__ = nodeSocketTypeGetIterator(); \ - for (; BLI_ghashIterator_notDone(__node_socket_type_iter__); BLI_ghashIterator_step(__node_socket_type_iter__)) { \ + for (; !BLI_ghashIterator_done(__node_socket_type_iter__); BLI_ghashIterator_step(__node_socket_type_iter__)) { \ bNodeSocketType *stype = BLI_ghashIterator_getValue(__node_socket_type_iter__); #define NODE_SOCKET_TYPES_END \ @@ -534,11 +534,11 @@ BLI_INLINE void BKE_node_instance_hash_iterator_free(bNode BLI_INLINE bNodeInstanceKey BKE_node_instance_hash_iterator_get_key(bNodeInstanceHashIterator *iter) { return *(bNodeInstanceKey *)BLI_ghashIterator_getKey(iter); } BLI_INLINE void *BKE_node_instance_hash_iterator_get_value(bNodeInstanceHashIterator *iter) { return BLI_ghashIterator_getValue(iter); } BLI_INLINE void BKE_node_instance_hash_iterator_step(bNodeInstanceHashIterator *iter) { BLI_ghashIterator_step(iter); } -BLI_INLINE bool BKE_node_instance_hash_iterator_not_done(bNodeInstanceHashIterator *iter) { return BLI_ghashIterator_notDone(iter); } +BLI_INLINE bool BKE_node_instance_hash_iterator_done(bNodeInstanceHashIterator *iter) { return BLI_ghashIterator_done(iter); } #define NODE_INSTANCE_HASH_ITER(iter_, hash_) \ for (BKE_node_instance_hash_iterator_init(&iter_, hash_); \ - BKE_node_instance_hash_iterator_not_done(&iter_); \ + BKE_node_instance_hash_iterator_done(&iter_) == false; \ BKE_node_instance_hash_iterator_step(&iter_)) |