forked from bartvdbraak/blender
Change !BLI_ghashIterator_isDone to BLI_ghashIterator_notDone. It is
always used in that context so we can at least avoid reverting it twice :p.
This commit is contained in:
parent
ee9def5105
commit
53b7bc8f1f
@ -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_isDone(&vi.bm_unique_verts)) {\
|
||||
if (BLI_ghashIterator_notDone(&vi.bm_unique_verts)) {\
|
||||
vi.bm_vert = BLI_ghashIterator_getKey(&vi.bm_unique_verts); \
|
||||
BLI_ghashIterator_step(&vi.bm_unique_verts); \
|
||||
} \
|
||||
|
@ -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_isDone(iter) == FALSE;
|
||||
BLI_ghashIterator_notDone(iter);
|
||||
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_isDone(hiter);
|
||||
BLI_ghashIterator_notDone(hiter);
|
||||
BLI_ghashIterator_step(hiter), ++i)
|
||||
{
|
||||
faces[i] = BLI_ghashIterator_getKey(hiter);
|
||||
|
@ -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_isDone(ihash) ) {
|
||||
while (BLI_ghashIterator_notDone(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_isDone(ihash) ) {
|
||||
while (BLI_ghashIterator_notDone(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_isDone(ihash) ) {
|
||||
while (BLI_ghashIterator_notDone(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_isDone(ihash) ) {
|
||||
while (BLI_ghashIterator_notDone(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_isDone(ihash) ) {
|
||||
while (BLI_ghashIterator_notDone(ihash) ) {
|
||||
|
||||
ccd_Mesh *ccdm = BLI_ghashIterator_getValue (ihash);
|
||||
ob = BLI_ghashIterator_getKey (ihash);
|
||||
|
@ -130,11 +130,11 @@ void BLI_ghashIterator_step(GHashIterator *ghi);
|
||||
* \param ghi The iterator.
|
||||
* \return True if done, False otherwise.
|
||||
*/
|
||||
int BLI_ghashIterator_isDone(GHashIterator *ghi);
|
||||
int BLI_ghashIterator_notDone(GHashIterator *ghi);
|
||||
|
||||
#define GHASH_ITER(gh_iter_, ghash_) \
|
||||
for (BLI_ghashIterator_init(&gh_iter_, ghash_); \
|
||||
!BLI_ghashIterator_isDone(&gh_iter_); \
|
||||
BLI_ghashIterator_notDone(&gh_iter_); \
|
||||
BLI_ghashIterator_step(&gh_iter_))
|
||||
|
||||
/* *** */
|
||||
|
@ -271,9 +271,9 @@ void BLI_ghashIterator_step(GHashIterator *ghi)
|
||||
}
|
||||
}
|
||||
}
|
||||
int BLI_ghashIterator_isDone(GHashIterator *ghi)
|
||||
int BLI_ghashIterator_notDone(GHashIterator *ghi)
|
||||
{
|
||||
return !ghi->curEntry;
|
||||
return ghi->curEntry != NULL;
|
||||
}
|
||||
|
||||
/***/
|
||||
|
@ -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_isDone(&ghi); BLI_ghashIterator_step(&ghi)) {
|
||||
for (; BLI_ghashIterator_notDone(&ghi); BLI_ghashIterator_step(&ghi)) {
|
||||
EditBone *bone = (EditBone *)BLI_ghashIterator_getValue(&ghi);
|
||||
|
||||
/* don't link with parent */
|
||||
|
@ -183,7 +183,7 @@ const char *BIF_listTemplates(const bContext *UNUSED(C))
|
||||
|
||||
BLI_ghashIterator_init(&ghi, TEMPLATES_HASH);
|
||||
|
||||
while (!BLI_ghashIterator_isDone(&ghi)) {
|
||||
while (BLI_ghashIterator_notDone(&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_isDone(&ghi)) {
|
||||
while (BLI_ghashIterator_notDone(&ghi)) {
|
||||
Object *ob = BLI_ghashIterator_getValue(&ghi);
|
||||
int key = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(&ghi));
|
||||
|
||||
|
@ -1659,7 +1659,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_isDone(&ghi);
|
||||
BLI_ghashIterator_notDone(&ghi);
|
||||
BLI_ghashIterator_step(&ghi))
|
||||
{
|
||||
EditFace *efa = BLI_ghashIterator_getValue(&ghi);
|
||||
@ -2045,7 +2045,7 @@ void mergeArcFaces(ReebGraph *UNUSED(rg), ReebArc *aDst, ReebArc *aSrc)
|
||||
GHashIterator ghi;
|
||||
|
||||
for (BLI_ghashIterator_init(&ghi, aSrc->faces);
|
||||
!BLI_ghashIterator_isDone(&ghi);
|
||||
BLI_ghashIterator_notDone(&ghi);
|
||||
BLI_ghashIterator_step(&ghi))
|
||||
{
|
||||
EditFace *efa = BLI_ghashIterator_getValue(&ghi);
|
||||
|
@ -672,7 +672,7 @@ static GHash *dupli_keyIndexHash(GHash *keyindex)
|
||||
gh = BLI_ghash_ptr_new("dupli_keyIndex gh");
|
||||
|
||||
for (hashIter = BLI_ghashIterator_new(keyindex);
|
||||
!BLI_ghashIterator_isDone(hashIter);
|
||||
BLI_ghashIterator_notDone(hashIter);
|
||||
BLI_ghashIterator_step(hashIter))
|
||||
{
|
||||
void *cv = BLI_ghashIterator_getKey(hashIter);
|
||||
|
@ -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_isDone(&ghi);
|
||||
BLI_ghashIterator_notDone(&ghi);
|
||||
BLI_ghashIterator_step(&ghi))
|
||||
{
|
||||
uiBut *but_key = BLI_ghashIterator_getKey(&ghi);
|
||||
|
@ -2718,7 +2718,7 @@ static void operator_search_cb(const bContext *C, void *UNUSED(arg), const char
|
||||
{
|
||||
GHashIterator *iter = WM_operatortype_iter();
|
||||
|
||||
for (; !BLI_ghashIterator_isDone(iter); BLI_ghashIterator_step(iter)) {
|
||||
for (; BLI_ghashIterator_notDone(iter); BLI_ghashIterator_step(iter)) {
|
||||
wmOperatorType *ot = BLI_ghashIterator_getValue(iter);
|
||||
|
||||
if ((ot->flag & OPTYPE_INTERNAL) && (G.debug & G_DEBUG_WM) == 0)
|
||||
|
@ -712,7 +712,7 @@ static UvSculptData *uv_sculpt_stroke_init(bContext *C, wmOperator *op, wmEvent
|
||||
return NULL;
|
||||
}
|
||||
/* fill the edges with data */
|
||||
for (i = 0; !BLI_ghashIterator_isDone(ghi); BLI_ghashIterator_step(ghi)) {
|
||||
for (i = 0; BLI_ghashIterator_notDone(ghi); BLI_ghashIterator_step(ghi)) {
|
||||
data->uvedges[i++] = *((UvEdge *)BLI_ghashIterator_getKey(ghi));
|
||||
}
|
||||
data->totalUvEdges = BLI_ghash_size(edgeHash);
|
||||
|
@ -615,7 +615,7 @@ static void operator_search_cb(const struct bContext *UNUSED(C), void *UNUSED(ar
|
||||
{
|
||||
GHashIterator *iter = WM_operatortype_iter();
|
||||
|
||||
for (; !BLI_ghashIterator_isDone(iter); BLI_ghashIterator_step(iter)) {
|
||||
for (; BLI_ghashIterator_notDone(iter); BLI_ghashIterator_step(iter)) {
|
||||
wmOperatorType *ot = BLI_ghashIterator_getValue(iter);
|
||||
|
||||
if (BLI_strcasestr(ot->idname, str)) {
|
||||
|
@ -220,7 +220,7 @@ static GHash *text_autocomplete_build(Text *text)
|
||||
TextFormatType *tft;
|
||||
tft = ED_text_format_get(text);
|
||||
|
||||
for (; !BLI_ghashIterator_isDone(iter); BLI_ghashIterator_step(iter)) {
|
||||
for (; BLI_ghashIterator_notDone(iter); BLI_ghashIterator_step(iter)) {
|
||||
const char *s = BLI_ghashIterator_getValue(iter);
|
||||
texttool_suggest_add(s, tft->format_identifier(s));
|
||||
}
|
||||
|
@ -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_isDone(iter); BLI_ghashIterator_step(iter)) {
|
||||
for (; BLI_ghashIterator_notDone(iter); BLI_ghashIterator_step(iter)) {
|
||||
wmOperatorType *ot = BLI_ghashIterator_getValue(iter);
|
||||
|
||||
if (BLI_strcasestr(ot->name, str)) {
|
||||
|
@ -1749,7 +1749,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_isDone(ghi); BLI_ghashIterator_step(ghi)) {
|
||||
for (i = 0, BLI_ghashIterator_init(ghi, edge_hash); BLI_ghashIterator_notDone(ghi); BLI_ghashIterator_step(ghi)) {
|
||||
edges[i++] = *((UvEdge *)BLI_ghashIterator_getKey(ghi));
|
||||
}
|
||||
|
||||
|
@ -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_isDone(ghi); BLI_ghashIterator_step(ghi)) {
|
||||
for (; BLI_ghashIterator_notDone(ghi); BLI_ghashIterator_step(ghi)) {
|
||||
name = BLI_ghashIterator_getValue(ghi);
|
||||
function = BLI_ghashIterator_getValue(ghi);
|
||||
|
||||
|
@ -145,7 +145,7 @@ static void check_unused_keys(MovieCache *cache)
|
||||
GHashIterator *iter;
|
||||
|
||||
iter = BLI_ghashIterator_new(cache->hash);
|
||||
while (!BLI_ghashIterator_isDone(iter)) {
|
||||
while (BLI_ghashIterator_notDone(iter)) {
|
||||
MovieCacheKey *key = BLI_ghashIterator_getKey(iter);
|
||||
MovieCacheItem *item = BLI_ghashIterator_getValue(iter);
|
||||
int remove = 0;
|
||||
@ -408,7 +408,7 @@ void IMB_moviecache_cleanup(MovieCache *cache, int (cleanup_check_cb) (void *use
|
||||
GHashIterator *iter;
|
||||
|
||||
iter = BLI_ghashIterator_new(cache->hash);
|
||||
while (!BLI_ghashIterator_isDone(iter)) {
|
||||
while (BLI_ghashIterator_notDone(iter)) {
|
||||
MovieCacheKey *key = BLI_ghashIterator_getKey(iter);
|
||||
int remove;
|
||||
|
||||
@ -457,7 +457,7 @@ void IMB_moviecache_get_cache_segments(MovieCache *cache, int proxy, int render_
|
||||
|
||||
iter = BLI_ghashIterator_new(cache->hash);
|
||||
a = 0;
|
||||
while (!BLI_ghashIterator_isDone(iter)) {
|
||||
while (BLI_ghashIterator_notDone(iter)) {
|
||||
MovieCacheKey *key = BLI_ghashIterator_getKey(iter);
|
||||
MovieCacheItem *item = BLI_ghashIterator_getValue(iter);
|
||||
int framenr, curproxy, curflags;
|
||||
|
@ -230,7 +230,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
|
||||
|
||||
/* copy the vertices across */
|
||||
for (hashIter = BLI_ghashIterator_new(vertHash);
|
||||
!BLI_ghashIterator_isDone(hashIter);
|
||||
BLI_ghashIterator_notDone(hashIter);
|
||||
BLI_ghashIterator_step(hashIter)
|
||||
)
|
||||
{
|
||||
|
@ -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_isDone(hashIter);
|
||||
BLI_ghashIterator_notDone(hashIter);
|
||||
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_isDone(hashIter);
|
||||
BLI_ghashIterator_notDone(hashIter);
|
||||
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_isDone(hashIter);
|
||||
BLI_ghashIterator_notDone(hashIter);
|
||||
BLI_ghashIterator_step(hashIter) )
|
||||
{
|
||||
int oldIndex = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(hashIter));
|
||||
|
@ -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_isDone(iter); BLI_ghashIterator_step(iter)) {
|
||||
for ( ; BLI_ghashIterator_notDone(iter); BLI_ghashIterator_step(iter)) {
|
||||
wmOperatorType *ot = BLI_ghashIterator_getValue(iter);
|
||||
|
||||
name = PyUnicode_FromString(ot->idname);
|
||||
|
@ -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_isDone(&weakinfo_hash_iter)) {
|
||||
while (BLI_ghashIterator_notDone(&weakinfo_hash_iter)) {
|
||||
PyObject *weakref = (PyObject *)BLI_ghashIterator_getKey(&weakinfo_hash_iter);
|
||||
PyObject *item = PyWeakref_GET_OBJECT(weakref);
|
||||
if (item != Py_None) {
|
||||
|
@ -1016,7 +1016,7 @@ void free_sss(Render *re)
|
||||
if (re->sss_hash) {
|
||||
GHashIterator *it= BLI_ghashIterator_new(re->sss_hash);
|
||||
|
||||
while (!BLI_ghashIterator_isDone(it)) {
|
||||
while (BLI_ghashIterator_notDone(it)) {
|
||||
sss_free_tree(BLI_ghashIterator_getValue(it));
|
||||
BLI_ghashIterator_step(it);
|
||||
}
|
||||
|
@ -218,7 +218,7 @@ void WM_uilisttype_free(void)
|
||||
{
|
||||
GHashIterator *iter = BLI_ghashIterator_new(uilisttypes_hash);
|
||||
|
||||
for (; !BLI_ghashIterator_isDone(iter); BLI_ghashIterator_step(iter)) {
|
||||
for (; BLI_ghashIterator_notDone(iter); BLI_ghashIterator_step(iter)) {
|
||||
uiListType *ult = BLI_ghashIterator_getValue(iter);
|
||||
if (ult->ext.free) {
|
||||
ult->ext.free(ult->ext.data);
|
||||
@ -271,7 +271,7 @@ void WM_menutype_free(void)
|
||||
{
|
||||
GHashIterator *iter = BLI_ghashIterator_new(menutypes_hash);
|
||||
|
||||
for (; !BLI_ghashIterator_isDone(iter); BLI_ghashIterator_step(iter)) {
|
||||
for (; BLI_ghashIterator_notDone(iter); BLI_ghashIterator_step(iter)) {
|
||||
MenuType *mt = BLI_ghashIterator_getValue(iter);
|
||||
if (mt->ext.free) {
|
||||
mt->ext.free(mt->ext.data);
|
||||
|
Loading…
Reference in New Issue
Block a user