diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-19 13:44:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-19 13:47:57 +0300 |
| commit | 08fe885d06a011e2d1613be7e3a41b56a8b0e880 (patch) | |
| tree | 921a6d9b2bc571aefa37094edfa1e278e9770319 /source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc | |
| parent | e46c49ff3dd67c7d759b581b677b4ab90cee3c46 (diff) | |
| parent | 889321e22b70006a550c923c0ace18e75732e106 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc index 9b3e46df69a..cfb98fe2f79 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc @@ -78,7 +78,7 @@ void DepsgraphRelationBuilder::build_view_layer(Scene *scene, ViewLayer *view_la * passed to the evaluation functions. During relations builder we only * do NULL-pointer check of the base, so it's fine to pass original one. */ - LINKLIST_FOREACH(Base *, base, &view_layer->object_bases) { + BLI_LISTBASE_FOREACH (Base *, base, &view_layer->object_bases) { build_object(base, base->object); } if (scene->camera != NULL) { @@ -105,11 +105,11 @@ void DepsgraphRelationBuilder::build_view_layer(Scene *scene, ViewLayer *view_la build_gpencil(scene->gpd); } /* Masks. */ - LINKLIST_FOREACH (Mask *, mask, &bmain_->mask) { + BLI_LISTBASE_FOREACH (Mask *, mask, &bmain_->mask) { build_mask(mask); } /* Movie clips. */ - LINKLIST_FOREACH (MovieClip *, clip, &bmain_->movieclip) { + BLI_LISTBASE_FOREACH (MovieClip *, clip, &bmain_->movieclip) { build_movieclip(clip); } /* Collections. */ |