diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-09 03:44:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-09 03:52:11 +0300 |
commit | f47a41a3d9f9850f852abb3d76bea2c8b281bb45 (patch) | |
tree | b50d618fa0300e4ae96a5cf7d3029013515c5e93 /source/blender/blenkernel/intern | |
parent | 9342f55d12f87dbc72e6953e0bc6c2564e57465f (diff) |
Cleanup: iterator macros
- put render iterator in own scope
(would shadow it's own variable if used multiple times).
- enforce semicolon at end of iterator macros.
- no need to typedef one-off macro structs.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/collection.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/collision.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/group.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/layer.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library_query.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library_remap.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/rigidbody.c | 14 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 |
11 files changed, 29 insertions, 29 deletions
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index ffd5aea35ea..fb27249402b 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -236,7 +236,7 @@ bool BKE_collection_remove(ID *owner_id, SceneCollection *sc) link = link_next; } } - FOREACH_SCENE_COLLECTION_END + FOREACH_SCENE_COLLECTION_END; for (LinkData *link = collection_objects.first; link; link = link->next) { BKE_collection_object_add(owner_id, sc_master, link->data); @@ -411,7 +411,7 @@ void BKE_collection_object_add_from(Scene *scene, Object *ob_src, Object *ob_dst collection_object_add(&scene->id, sc, ob_dst); } } - FOREACH_SCENE_COLLECTION_END + FOREACH_SCENE_COLLECTION_END; for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { Base *base_src = BKE_view_layer_base_find(view_layer, ob_src); @@ -484,7 +484,7 @@ bool BKE_collections_object_remove(Main *bmain, ID *owner_id, Object *ob, const { removed |= BKE_collection_object_remove(bmain, owner_id, sc, ob, free_us); } - FOREACH_SCENE_COLLECTION_END + FOREACH_SCENE_COLLECTION_END; return removed; } @@ -556,7 +556,7 @@ Group *BKE_collection_group_create(Main *bmain, Scene *scene, LayerCollection *l { sc_group->type = COLLECTION_TYPE_GROUP_INTERNAL; } - FOREACH_SCENE_COLLECTION_END + FOREACH_SCENE_COLLECTION_END; lc_dst = BKE_collection_link(group->view_layer, sc_dst); layer_collection_sync(lc_dst, lc_src); diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 55ded96fe01..c1872c92418 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -510,7 +510,7 @@ static void add_collision_object(Object ***objs, unsigned int *numobj, unsigned { add_collision_object(objs, numobj, maxobj, object, self, level+1, modifier_type); } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } } @@ -531,7 +531,7 @@ Object **get_collisionobjects_ext(Scene *scene, Object *self, Group *group, unsi { add_collision_object(&objs, &numobj, &maxobj, object, self, level, modifier_type); } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } else { Scene *sce_iter; @@ -588,7 +588,7 @@ static void add_collider_cache_object(ListBase **objs, Object *ob, Object *self, { add_collider_cache_object(objs, object, self, level+1); } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } } @@ -602,7 +602,7 @@ ListBase *get_collider_cache(Scene *scene, Object *self, Group *group) { add_collider_cache_object(&objs, object, self, 0); } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } else { Scene *sce_iter; diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c index c5cea750b53..c3fe586bbbb 100644 --- a/source/blender/blenkernel/intern/group.c +++ b/source/blender/blenkernel/intern/group.c @@ -219,7 +219,7 @@ static bool group_object_cyclic_check_internal(Object *object, Group *group) return true; } } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } /* un-flag the object, it's allowed to have the same group multiple times in parallel */ @@ -284,7 +284,7 @@ bool BKE_group_is_animated(Group *group, Object *UNUSED(parent)) return true; } } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; return false; } @@ -375,7 +375,7 @@ void BKE_group_handle_recalc_and_update(const struct EvaluationContext *eval_ctx BKE_object_handle_update(eval_ctx, scene, object); } } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } } diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 82ac666c46b..cde256a0f14 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -2137,7 +2137,7 @@ void BKE_visible_bases_iterator_end(BLI_Iterator *UNUSED(iter)) void BKE_renderable_objects_iterator_begin(BLI_Iterator *iter, void *data_in) { - ObjectsRenderableIteratorData *data = data_in; + struct ObjectsRenderableIteratorData *data = data_in; /* Tag objects to prevent going over the same object twice. */ for (Scene *scene = data->scene; scene; scene = scene->set) { @@ -2165,7 +2165,7 @@ void BKE_renderable_objects_iterator_next(BLI_Iterator *iter) /* Set it early in case we need to exit and we are running from within a loop. */ iter->skip = true; - ObjectsRenderableIteratorData *data = iter->data; + struct ObjectsRenderableIteratorData *data = iter->data; Base *base = data->iter.base->next; /* There is still a base in the current scene layer. */ diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index 2a5c8f955ab..27a2916ef92 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -446,7 +446,7 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call CALLBACK_INVOKE_ID(link->data, IDWALK_CB_USER); } } - FOREACH_SCENE_COLLECTION_END + FOREACH_SCENE_COLLECTION_END; ViewLayer *view_layer; for (view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) { diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c index 46f5e427a40..483500cf67d 100644 --- a/source/blender/blenkernel/intern/library_remap.c +++ b/source/blender/blenkernel/intern/library_remap.c @@ -320,7 +320,7 @@ static void libblock_remap_data_preprocess(IDRemap *r_id_remap_data) libblock_remap_data_preprocess_group_unlink( r_id_remap_data, ob_iter, skip_indirect, is_indirect); } - FOREACH_SCENE_OBJECT_END + FOREACH_SCENE_OBJECT_END; } else if (GS(r_id_remap_data->old_id->name) == ID_OB) { /* ... a specific object from scene. */ @@ -405,7 +405,7 @@ static void libblock_remap_data_postprocess_group_scene_unlink(Main *UNUSED(bmai } } } - FOREACH_SCENE_OBJECT_END + FOREACH_SCENE_OBJECT_END; } static void libblock_remap_data_postprocess_obdata_relink(Main *UNUSED(bmain), Object *ob, ID *new_id) diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index 391be751ae0..7419efba065 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -937,7 +937,7 @@ static void make_duplis_particle_system(const DupliContext *ctx, ParticleSystem (void) object; totgroup++; } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } /* we also copy the actual objects to restore afterwards, since @@ -967,7 +967,7 @@ static void make_duplis_particle_system(const DupliContext *ctx, ParticleSystem continue; } } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } } else { @@ -1082,7 +1082,7 @@ static void make_duplis_particle_system(const DupliContext *ctx, ParticleSystem b++; } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } else { /* to give ipos in object correct offset */ diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index e90fa299f44..94f37c3e02c 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -365,7 +365,7 @@ void psys_check_group_weights(ParticleSettings *part) BLI_addtail(&part->dupliweights, dw); } } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; dw = part->dupliweights.first; for (; dw; dw = dw->next) { diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 20a31ca6b5e..4cf8533d843 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -2967,7 +2967,7 @@ static void psys_update_path_cache(ParticleSimulationData *sim, float cfra, cons } } } - FOREACH_SCENE_OBJECT_END + FOREACH_SCENE_OBJECT_END; if (!skip) { psys_cache_paths(sim, cfra, use_render_params); diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index d61cb0c9369..12a53f5f3e5 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -101,7 +101,7 @@ void BKE_rigidbody_free_world(RigidBodyWorld *rbw) } } } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } if (rbw->group) { @@ -114,7 +114,7 @@ void BKE_rigidbody_free_world(RigidBodyWorld *rbw) } } } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } /* free dynamics world */ RB_dworld_delete(rbw->physics_world); @@ -1157,7 +1157,7 @@ void BKE_rigidbody_remove_object(Scene *scene, Object *ob) } } } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } } @@ -1206,7 +1206,7 @@ static void rigidbody_update_ob_array(RigidBodyWorld *rbw) rbw->objects[i] = object; i++; } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } static void rigidbody_update_sim_world(Scene *scene, RigidBodyWorld *rbw) @@ -1341,7 +1341,7 @@ static void rigidbody_update_simulation(const struct EvaluationContext *eval_ctx rbc->physics_constraint = NULL; } } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } /* update objects */ @@ -1388,7 +1388,7 @@ static void rigidbody_update_simulation(const struct EvaluationContext *eval_ctx rigidbody_update_sim_ob(eval_ctx, scene, rbw, ob, rbo); } } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; /* update constraints */ if (rbw->constraints == NULL) /* no constraints, move on */ @@ -1422,7 +1422,7 @@ static void rigidbody_update_simulation(const struct EvaluationContext *eval_ctx rbc->flag &= ~RBC_FLAG_NEEDS_VALIDATE; } } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } static void rigidbody_update_simulation_post_step(RigidBodyWorld *rbw) diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 9a570ad0e46..ca9cddde65a 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -965,7 +965,7 @@ void BKE_scene_set_background(Main *bmain, Scene *scene) { object->flag |= OB_FROMGROUP; } - FOREACH_GROUP_OBJECT_END + FOREACH_GROUP_OBJECT_END; } /* copy layers and flags from bases to objects */ |