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 | |
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')
25 files changed, 43 insertions, 43 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_)) diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h index 3d73674d990..4c811d55dbe 100644 --- a/source/blender/blenkernel/BKE_pbvh.h +++ b/source/blender/blenkernel/BKE_pbvh.h @@ -295,7 +295,7 @@ void pbvh_vertex_iter_init(PBVH *bvh, PBVHNode *node, vi.mask = &vi.vmask[vi.vert_indices[vi.gx]]; \ } \ else { \ - if (BLI_ghashIterator_notDone(&vi.bm_unique_verts)) {\ + if (!BLI_ghashIterator_done(&vi.bm_unique_verts)) {\ vi.bm_vert = BLI_ghashIterator_getKey(&vi.bm_unique_verts); \ BLI_ghashIterator_step(&vi.bm_unique_verts); \ } \ diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 4f3678098ec..ead8d1f1b25 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -294,7 +294,7 @@ static void build_mesh_leaf_node(PBVH *bvh, PBVHNode *node) /* Build the vertex list, unique verts first */ for (iter = BLI_ghashIterator_new(map), i = 0; - BLI_ghashIterator_notDone(iter); + BLI_ghashIterator_done(iter) == false; BLI_ghashIterator_step(iter), ++i) { void *value = BLI_ghashIterator_getValue(iter); @@ -1217,7 +1217,7 @@ void BKE_pbvh_get_grid_updates(PBVH *bvh, int clear, void ***gridfaces, int *tot faces = MEM_callocN(sizeof(void *) * tot, "PBVH Grid Faces"); for (hiter = BLI_ghashIterator_new(map), i = 0; - BLI_ghashIterator_notDone(hiter); + BLI_ghashIterator_done(hiter) == false; BLI_ghashIterator_step(hiter), ++i) { faces[i] = BLI_ghashIterator_getKey(hiter); diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 54226d231ae..d600b82522d 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -1034,7 +1034,7 @@ static int sb_detect_aabb_collisionCached(float UNUSED(force[3]), unsigned int U hash = vertexowner->soft->scratch->colliderhash; ihash = BLI_ghashIterator_new(hash); - while (BLI_ghashIterator_notDone(ihash) ) { + while (!BLI_ghashIterator_done(ihash)) { ccd_Mesh *ccdm = BLI_ghashIterator_getValue (ihash); ob = BLI_ghashIterator_getKey (ihash); @@ -1113,7 +1113,7 @@ static int sb_detect_face_pointCached(float face_v1[3], float face_v2[3], float hash = vertexowner->soft->scratch->colliderhash; ihash = BLI_ghashIterator_new(hash); - while (BLI_ghashIterator_notDone(ihash) ) { + while (!BLI_ghashIterator_done(ihash)) { ccd_Mesh *ccdm = BLI_ghashIterator_getValue (ihash); ob = BLI_ghashIterator_getKey (ihash); @@ -1205,7 +1205,7 @@ static int sb_detect_face_collisionCached(float face_v1[3], float face_v2[3], fl hash = vertexowner->soft->scratch->colliderhash; ihash = BLI_ghashIterator_new(hash); - while (BLI_ghashIterator_notDone(ihash) ) { + while (!BLI_ghashIterator_done(ihash)) { ccd_Mesh *ccdm = BLI_ghashIterator_getValue (ihash); ob = BLI_ghashIterator_getKey (ihash); @@ -1433,7 +1433,7 @@ static int sb_detect_edge_collisionCached(float edge_v1[3], float edge_v2[3], fl hash = vertexowner->soft->scratch->colliderhash; ihash = BLI_ghashIterator_new(hash); - while (BLI_ghashIterator_notDone(ihash) ) { + while (!BLI_ghashIterator_done(ihash)) { ccd_Mesh *ccdm = BLI_ghashIterator_getValue (ihash); ob = BLI_ghashIterator_getKey (ihash); @@ -1763,7 +1763,7 @@ static int sb_detect_vertex_collisionCached(float opco[3], float facenormal[3], outerforceaccu[0]=outerforceaccu[1]=outerforceaccu[2]=0.0f; innerforceaccu[0]=innerforceaccu[1]=innerforceaccu[2]=0.0f; /* go */ - while (BLI_ghashIterator_notDone(ihash) ) { + while (!BLI_ghashIterator_done(ihash)) { ccd_Mesh *ccdm = BLI_ghashIterator_getValue (ihash); ob = BLI_ghashIterator_getKey (ihash); diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h index d54d4d5272b..4555fa85601 100644 --- a/source/blender/blenlib/BLI_ghash.h +++ b/source/blender/blenlib/BLI_ghash.h @@ -132,11 +132,11 @@ void BLI_ghashIterator_step(GHashIterator *ghi); * \param ghi The iterator. * \return True if done, False otherwise. */ -bool BLI_ghashIterator_notDone(GHashIterator *ghi); +bool BLI_ghashIterator_done(GHashIterator *ghi); #define GHASH_ITER(gh_iter_, ghash_) \ for (BLI_ghashIterator_init(&gh_iter_, ghash_); \ - BLI_ghashIterator_notDone(&gh_iter_); \ + BLI_ghashIterator_done(&gh_iter_) == false; \ BLI_ghashIterator_step(&gh_iter_)) /* *** */ diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index f46643c5d89..df3bfc7ef1b 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -299,9 +299,9 @@ void BLI_ghashIterator_step(GHashIterator *ghi) } } } -bool BLI_ghashIterator_notDone(GHashIterator *ghi) +bool BLI_ghashIterator_done(GHashIterator *ghi) { - return ghi->curEntry != NULL; + return ghi->curEntry == NULL; } /***/ diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c index 536c5ff1f7c..a6ee2a2acad 100644 --- a/source/blender/editors/armature/editarmature_retarget.c +++ b/source/blender/editors/armature/editarmature_retarget.c @@ -896,7 +896,7 @@ static void RIG_reconnectControlBones(RigGraph *rg) /* look on deform bones first */ BLI_ghashIterator_init(&ghi, rg->bones_map); - for (; BLI_ghashIterator_notDone(&ghi); BLI_ghashIterator_step(&ghi)) { + for (; !BLI_ghashIterator_done(&ghi); BLI_ghashIterator_step(&ghi)) { EditBone *bone = (EditBone *)BLI_ghashIterator_getValue(&ghi); /* don't link with parent */ diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index eb76c460b51..8ae1b9557ee 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -183,7 +183,7 @@ const char *BIF_listTemplates(const bContext *UNUSED(C)) BLI_ghashIterator_init(&ghi, TEMPLATES_HASH); - while (BLI_ghashIterator_notDone(&ghi)) { + while (!BLI_ghashIterator_done(&ghi)) { Object *ob = BLI_ghashIterator_getValue(&ghi); int key = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(&ghi)); @@ -203,7 +203,7 @@ int BIF_currentTemplate(const bContext *C) GHashIterator ghi; BLI_ghashIterator_init(&ghi, TEMPLATES_HASH); - while (BLI_ghashIterator_notDone(&ghi)) { + while (!BLI_ghashIterator_done(&ghi)) { Object *ob = BLI_ghashIterator_getValue(&ghi); int key = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(&ghi)); diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c index 665c5f628d9..f66fb38a2a6 100644 --- a/source/blender/editors/armature/reeb.c +++ b/source/blender/editors/armature/reeb.c @@ -1661,7 +1661,7 @@ int filterSmartReebGraph(ReebGraph *UNUSED(rg), float UNUSED(threshold)) float avg_vec[3] = {0, 0, 0}; for (BLI_ghashIterator_init(&ghi, arc->faces); - BLI_ghashIterator_notDone(&ghi); + BLI_ghashIterator_done(&ghi) == false; BLI_ghashIterator_step(&ghi)) { EditFace *efa = BLI_ghashIterator_getValue(&ghi); @@ -2047,7 +2047,7 @@ void mergeArcFaces(ReebGraph *UNUSED(rg), ReebArc *aDst, ReebArc *aSrc) GHashIterator ghi; for (BLI_ghashIterator_init(&ghi, aSrc->faces); - BLI_ghashIterator_notDone(&ghi); + BLI_ghashIterator_done(&ghi) == false; BLI_ghashIterator_step(&ghi)) { EditFace *efa = BLI_ghashIterator_getValue(&ghi); diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 08cae94fc93..6ef5d3b1385 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -676,7 +676,7 @@ static GHash *dupli_keyIndexHash(GHash *keyindex) gh = BLI_ghash_ptr_new("dupli_keyIndex gh"); for (hashIter = BLI_ghashIterator_new(keyindex); - BLI_ghashIterator_notDone(hashIter); + BLI_ghashIterator_done(hashIter) == false; BLI_ghashIterator_step(hashIter)) { void *cv = BLI_ghashIterator_getKey(hashIter); diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index e4b76cb0399..1dc6f44c95a 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -853,7 +853,7 @@ static int editsource_exec(bContext *C, wmOperator *op) ED_region_do_draw(C, ar); for (BLI_ghashIterator_init(&ghi, ui_editsource_info->hash); - BLI_ghashIterator_notDone(&ghi); + BLI_ghashIterator_done(&ghi) == false; BLI_ghashIterator_step(&ghi)) { uiBut *but_key = BLI_ghashIterator_getKey(&ghi); diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 4bb4fe6b532..d9c874eb192 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2752,7 +2752,7 @@ static void operator_search_cb(const bContext *C, void *UNUSED(arg), const char { GHashIterator *iter = WM_operatortype_iter(); - for (; BLI_ghashIterator_notDone(iter); BLI_ghashIterator_step(iter)) { + for (; !BLI_ghashIterator_done(iter); BLI_ghashIterator_step(iter)) { wmOperatorType *ot = BLI_ghashIterator_getValue(iter); if ((ot->flag & OPTYPE_INTERNAL) && (G.debug & G_DEBUG_WM) == 0) diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index 250594459f3..9c73d4d9477 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -712,7 +712,7 @@ static UvSculptData *uv_sculpt_stroke_init(bContext *C, wmOperator *op, const wm return NULL; } /* fill the edges with data */ - for (i = 0; BLI_ghashIterator_notDone(ghi); BLI_ghashIterator_step(ghi)) { + for (i = 0; !BLI_ghashIterator_done(ghi); BLI_ghashIterator_step(ghi)) { data->uvedges[i++] = *((UvEdge *)BLI_ghashIterator_getKey(ghi)); } data->totalUvEdges = BLI_ghash_size(edgeHash); diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index d22ea674668..d4fdc9af4a0 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -745,7 +745,7 @@ static void operator_search_cb(const struct bContext *UNUSED(C), void *UNUSED(ar { GHashIterator *iter = WM_operatortype_iter(); - for (; BLI_ghashIterator_notDone(iter); BLI_ghashIterator_step(iter)) { + for (; !BLI_ghashIterator_done(iter); BLI_ghashIterator_step(iter)) { wmOperatorType *ot = BLI_ghashIterator_getValue(iter); if (BLI_strcasestr(ot->idname, str)) { diff --git a/source/blender/editors/space_text/text_autocomplete.c b/source/blender/editors/space_text/text_autocomplete.c index 838ffb948b1..b3ac04fac21 100644 --- a/source/blender/editors/space_text/text_autocomplete.c +++ b/source/blender/editors/space_text/text_autocomplete.c @@ -220,7 +220,7 @@ static GHash *text_autocomplete_build(Text *text) TextFormatType *tft; tft = ED_text_format_get(text); - for (; BLI_ghashIterator_notDone(iter); BLI_ghashIterator_step(iter)) { + for (; !BLI_ghashIterator_done(iter); BLI_ghashIterator_step(iter)) { const char *s = BLI_ghashIterator_getValue(iter); texttool_suggest_add(s, tft->format_identifier(s)); } diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c index d30c1699d65..00e13eb4b6b 100644 --- a/source/blender/editors/space_view3d/view3d_toolbar.c +++ b/source/blender/editors/space_view3d/view3d_toolbar.c @@ -156,7 +156,7 @@ static void operator_search_cb(const struct bContext *C, void *UNUSED(arg), cons { GHashIterator *iter = WM_operatortype_iter(); - for (; BLI_ghashIterator_notDone(iter); BLI_ghashIterator_step(iter)) { + for (; !BLI_ghashIterator_done(iter); BLI_ghashIterator_step(iter)) { wmOperatorType *ot = BLI_ghashIterator_getValue(iter); if (BLI_strcasestr(ot->name, str)) { diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index 458d6999bf8..119f71ac941 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -1752,7 +1752,7 @@ static int stitch_init(bContext *C, wmOperator *op) state->total_separate_edges = total_edges; /* fill the edges with data */ - for (i = 0, BLI_ghashIterator_init(ghi, edge_hash); BLI_ghashIterator_notDone(ghi); BLI_ghashIterator_step(ghi)) { + for (i = 0, BLI_ghashIterator_init(ghi, edge_hash); !BLI_ghashIterator_done(ghi); BLI_ghashIterator_step(ghi)) { edges[i++] = *((UvEdge *)BLI_ghashIterator_getKey(ghi)); } diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index f1b631192af..52a1c09fc5f 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -197,7 +197,7 @@ static char *gpu_generate_function_prototyps(GHash *hash) * generated code, to avoid have to add the actual code & recompile all */ ghi = BLI_ghashIterator_new(hash); - for (; BLI_ghashIterator_notDone(ghi); BLI_ghashIterator_step(ghi)) { + for (; !BLI_ghashIterator_done(ghi); BLI_ghashIterator_step(ghi)) { name = BLI_ghashIterator_getValue(ghi); function = BLI_ghashIterator_getValue(ghi); diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c index 94fe1f44d91..90eea438c5e 100644 --- a/source/blender/imbuf/intern/moviecache.c +++ b/source/blender/imbuf/intern/moviecache.c @@ -145,7 +145,7 @@ static void check_unused_keys(MovieCache *cache) GHashIterator *iter; iter = BLI_ghashIterator_new(cache->hash); - while (BLI_ghashIterator_notDone(iter)) { + while (!BLI_ghashIterator_done(iter)) { MovieCacheKey *key = BLI_ghashIterator_getKey(iter); MovieCacheItem *item = BLI_ghashIterator_getValue(iter); int remove = 0; @@ -448,7 +448,7 @@ void IMB_moviecache_cleanup(MovieCache *cache, int (cleanup_check_cb) (void *use GHashIterator *iter; iter = BLI_ghashIterator_new(cache->hash); - while (BLI_ghashIterator_notDone(iter)) { + while (!BLI_ghashIterator_done(iter)) { MovieCacheKey *key = BLI_ghashIterator_getKey(iter); int remove; @@ -497,7 +497,7 @@ void IMB_moviecache_get_cache_segments(MovieCache *cache, int proxy, int render_ iter = BLI_ghashIterator_new(cache->hash); a = 0; - while (BLI_ghashIterator_notDone(iter)) { + while (!BLI_ghashIterator_done(iter)) { MovieCacheKey *key = BLI_ghashIterator_getKey(iter); MovieCacheItem *item = BLI_ghashIterator_getValue(iter); int framenr, curproxy, curflags; diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c index 0f5f9db2ee6..e614213d028 100644 --- a/source/blender/modifiers/intern/MOD_build.c +++ b/source/blender/modifiers/intern/MOD_build.c @@ -230,7 +230,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob), /* copy the vertices across */ for (hashIter = BLI_ghashIterator_new(vertHash); - BLI_ghashIterator_notDone(hashIter); + BLI_ghashIterator_done(hashIter) == false; BLI_ghashIterator_step(hashIter) ) { diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c index b86802340dc..46a590e24e9 100644 --- a/source/blender/modifiers/intern/MOD_mask.c +++ b/source/blender/modifiers/intern/MOD_mask.c @@ -316,7 +316,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, /* using ghash-iterators, map data into new mesh */ /* vertices */ for (hashIter = BLI_ghashIterator_new(vertHash); - BLI_ghashIterator_notDone(hashIter); + BLI_ghashIterator_done(hashIter) == false; BLI_ghashIterator_step(hashIter) ) { MVert source; @@ -334,7 +334,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, /* edges */ for (hashIter = BLI_ghashIterator_new(edgeHash); - BLI_ghashIterator_notDone(hashIter); + BLI_ghashIterator_done(hashIter) == false; BLI_ghashIterator_step(hashIter)) { MEdge source; @@ -355,7 +355,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, /* faces */ for (hashIter = BLI_ghashIterator_new(polyHash); - BLI_ghashIterator_notDone(hashIter); + BLI_ghashIterator_done(hashIter) == false; BLI_ghashIterator_step(hashIter) ) { int oldIndex = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(hashIter)); diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c index 26c043f796f..d13ec3c461a 100644 --- a/source/blender/python/intern/bpy_operator.c +++ b/source/blender/python/intern/bpy_operator.c @@ -369,7 +369,7 @@ static PyObject *pyop_dir(PyObject *UNUSED(self)) GHashIterator *iter = WM_operatortype_iter(); PyObject *list = PyList_New(0), *name; - for ( ; BLI_ghashIterator_notDone(iter); BLI_ghashIterator_step(iter)) { + for ( ; !BLI_ghashIterator_done(iter); BLI_ghashIterator_step(iter)) { wmOperatorType *ot = BLI_ghashIterator_getValue(iter); name = PyUnicode_FromString(ot->idname); diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 48caa40ca9c..f1c0530fedf 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -250,7 +250,7 @@ static void id_release_weakref_list(struct ID *id, GHash *weakinfo_hash) fprintf(stdout, "id_release_weakref: '%s', %d items\n", id->name, BLI_ghash_size(weakinfo_hash)); #endif - while (BLI_ghashIterator_notDone(&weakinfo_hash_iter)) { + while (!BLI_ghashIterator_done(&weakinfo_hash_iter)) { PyObject *weakref = (PyObject *)BLI_ghashIterator_getKey(&weakinfo_hash_iter); PyObject *item = PyWeakref_GET_OBJECT(weakref); if (item != Py_None) { diff --git a/source/blender/render/intern/source/sss.c b/source/blender/render/intern/source/sss.c index 9d6391ccb59..abce1297783 100644 --- a/source/blender/render/intern/source/sss.c +++ b/source/blender/render/intern/source/sss.c @@ -1018,7 +1018,7 @@ void free_sss(Render *re) if (re->sss_hash) { GHashIterator *it= BLI_ghashIterator_new(re->sss_hash); - while (BLI_ghashIterator_notDone(it)) { + while (!BLI_ghashIterator_done(it)) { sss_free_tree(BLI_ghashIterator_getValue(it)); BLI_ghashIterator_step(it); } diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index daa883e9c7d..8163e9544aa 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -234,7 +234,7 @@ void WM_uilisttype_free(void) { GHashIterator *iter = BLI_ghashIterator_new(uilisttypes_hash); - for (; BLI_ghashIterator_notDone(iter); BLI_ghashIterator_step(iter)) { + for (; !BLI_ghashIterator_done(iter); BLI_ghashIterator_step(iter)) { uiListType *ult = BLI_ghashIterator_getValue(iter); if (ult->ext.free) { ult->ext.free(ult->ext.data); @@ -287,7 +287,7 @@ void WM_menutype_free(void) { GHashIterator *iter = BLI_ghashIterator_new(menutypes_hash); - for (; BLI_ghashIterator_notDone(iter); BLI_ghashIterator_step(iter)) { + for (; !BLI_ghashIterator_done(iter); BLI_ghashIterator_step(iter)) { MenuType *mt = BLI_ghashIterator_getValue(iter); if (mt->ext.free) { mt->ext.free(mt->ext.data); |