Merge branch 'master' into blender2.8
[blender.git] / source / blender / depsgraph / intern / builder / deg_builder_nodes_view_layer.cc
index 4ca19f4e14fcd4b44036b987d8eef74793989f2f..7a0fc79078025f63199b64f4963c37762d556bc0 100644 (file)
@@ -84,7 +84,7 @@ void DepsgraphNodeBuilder::build_view_layer(
                 * otherwise remapping will not replace objects with their CoW versions
                 * for CoW bases.
                 */
-               BLI_LISTBASE_FOREACH (Base *, base, &view_layer->object_bases) {
+               LISTBASE_FOREACH (Base *, base, &view_layer->object_bases) {
                        Object *object = base->object;
                        add_id_node(&object->id, false);
                }
@@ -145,15 +145,15 @@ void DepsgraphNodeBuilder::build_view_layer(
                build_gpencil(scene->gpd);
        }
        /* Cache file. */
-       BLI_LISTBASE_FOREACH (CacheFile *, cachefile, &bmain_->cachefiles) {
+       LISTBASE_FOREACH (CacheFile *, cachefile, &bmain_->cachefiles) {
                build_cachefile(cachefile);
        }
        /* Masks. */
-       BLI_LISTBASE_FOREACH (Mask *, mask, &bmain_->mask) {
+       LISTBASE_FOREACH (Mask *, mask, &bmain_->mask) {
                build_mask(mask);
        }
        /* Movie clips. */
-       BLI_LISTBASE_FOREACH (MovieClip *, clip, &bmain_->movieclip) {
+       LISTBASE_FOREACH (MovieClip *, clip, &bmain_->movieclip) {
                build_movieclip(clip);
        }
        /* Collections. */