Sanitize use of BLI_iterator

We now initialize iter.valid as true as part of the main iterator (and manually
when using via Python). And we don't even bother setting iter->current to NULL
if it's invalid. Let's stick to using iter->valid only.

1 files changed, 4 insertions, 5 deletions

diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 2b69c176c39..2a1157cf6b4 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -535,7 +535,6 @@ void BKE_scene_collections_iterator_begin(BLI_Iterator *iter, void *data_in)
 
 	data->cur = 0;
 	iter->current = data->array[data->cur];
-	iter->valid = true;
 }
 
 void BKE_scene_collections_iterator_next(struct BLI_Iterator *iter)
@@ -585,10 +584,10 @@ void BKE_scene_objects_iterator_begin(BLI_Iterator *iter, void *data_in)
 	BKE_scene_collections_iterator_begin(&data->scene_collection_iter, scene);
 
 	SceneCollection *sc = data->scene_collection_iter.current;
-	iter->current = sc->objects.first ? ((LinkData *)sc->objects.first)->data : NULL;
-	iter->valid = true;
-
-	if (iter->current == NULL) {
+	if (sc->objects.first != NULL) {
+		iter->current = ((LinkData *)sc->objects.first)->data;
+	}
+	else {
 		BKE_scene_objects_iterator_next(iter);
 	}
 }