Depsgraph: Remove function bindings with collections

Use single function to evaluate all the collections for the given view layer.

This way we avoid need to get scene ID sub-data. Similar to pchan index, this
allows us to avoid build-time scene expansion, which also simplifies update of
the scene datablock.

Well, sort of. There is still work to be done to get rid of build-time scene
datablock expansion, which includes:

- Need to pass view layer by index.

  Annoying part would be to get actual view layer for that index. In practice
  doing list lookup might not be such a bad idea, since such lookup will not
  happen very often, and it is unlikely to have more than handful of view
  layer anyway.

  Other idea could be to use view layer from evaluation context.
  Or maybe from depsgraph, which is supposed to be in the context. Can have
  some assert statements to make sure everything is good.

- Need to get id of base binding for flags flush.

  We can replace that with index-based lookup from an array created by view
  layer evaluation.

Reviewers: dfelinto

Differential Revision: https://developer.blender.org/D3141

1 files changed, 1 insertions, 25 deletions

diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index 20da1e7b7ac..7566d370c45 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -381,33 +381,9 @@ void BKE_group_handle_recalc_and_update(const struct EvaluationContext *eval_ctx
 
 /* ******** Dependency graph evaluation ******** */
 
-static void group_eval_layer_collections(
-        const struct EvaluationContext *eval_ctx,
-        Group *group,
-        ListBase *layer_collections,
-        LayerCollection *parent_layer_collection)
-{
-	LISTBASE_FOREACH (LayerCollection *, layer_collection, layer_collections) {
-		/* Evaluate layer collection itself. */
-		BKE_layer_eval_layer_collection(eval_ctx,
-		                                layer_collection,
-		                                parent_layer_collection);
-		/* Evaluate nested collections. */
-		group_eval_layer_collections(eval_ctx,
-		                             group,
-		                             &layer_collection->layer_collections,
-		                             layer_collection);
-	}
-}
-
 void BKE_group_eval_view_layers(const struct EvaluationContext *eval_ctx,
                                 Group *group)
 {
 	DEG_debug_print_eval(__func__, group->id.name, group);
-	BKE_layer_eval_layer_collection_pre(eval_ctx, &group->id, group->view_layer);
-	group_eval_layer_collections(eval_ctx,
-	                             group,
-	                             &group->view_layer->layer_collections,
-	                             NULL);
-	BKE_layer_eval_layer_collection_post(eval_ctx, group->view_layer);
+	BKE_layer_eval_view_layer(eval_ctx, &group->id, group->view_layer);
 }