Depsgraph: remove EvaluationContext, pass Depsgraph instead.

The depsgraph was always created within a fixed evaluation context. Passing
both risks the depsgraph and evaluation context not matching, and it
complicates the Python API where we'd have to expose both which is not so
easy to understand.

This also removes the global evaluation context in main, which assumed there
to be a single active scene and view layer.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c
index e20c6a35303..0451031c5b8 100644
--- a/source/blender/blenkernel/intern/data_transfer.c
+++ b/source/blender/blenkernel/intern/data_transfer.c
@@ -1010,7 +1010,7 @@ static bool data_transfer_layersmapping_generate(
  * to get (as much as possible) exact copy of source data layout.
  */
 void BKE_object_data_transfer_layout(
-        const struct EvaluationContext *eval_ctx, Scene *scene,
+        struct Depsgraph *depsgraph, Scene *scene,
         Object *ob_src, Object *ob_dst, const int data_types, const bool use_delete,
         const int fromlayers_select[DT_MULTILAYER_INDEX_MAX], const int tolayers_select[DT_MULTILAYER_INDEX_MAX])
 {
@@ -1028,7 +1028,7 @@ void BKE_object_data_transfer_layout(
 
 	/* Get source DM.*/
 	dm_src_mask |= BKE_object_data_transfer_dttypes_to_cdmask(data_types);
-	dm_src = mesh_get_derived_final(eval_ctx, scene, ob_src, dm_src_mask);
+	dm_src = mesh_get_derived_final(depsgraph, scene, ob_src, dm_src_mask);
 	if (!dm_src) {
 		return;
 	}
@@ -1086,7 +1086,7 @@ void BKE_object_data_transfer_layout(
 }
 
 bool BKE_object_data_transfer_dm(
-        const struct EvaluationContext *eval_ctx, Scene *scene, Object *ob_src, Object *ob_dst, DerivedMesh *dm_dst,
+        struct Depsgraph *depsgraph, Scene *scene, Object *ob_src, Object *ob_dst, DerivedMesh *dm_dst,
         const int data_types, bool use_create, const int map_vert_mode, const int map_edge_mode,
         const int map_loop_mode, const int map_poly_mode, SpaceTransform *space_transform, const bool auto_transform,
         const float max_distance, const float ray_radius, const float islands_handling_precision,
@@ -1150,7 +1150,7 @@ bool BKE_object_data_transfer_dm(
 	 *     Also, we need to make a local copy of dm_src, otherwise we may end with concurrent creation
 	 *     of data in it (multi-threaded evaluation of the modifier stack, see T46672).
 	 */
-	dm_src = dm_dst ? ob_src->derivedFinal : mesh_get_derived_final(eval_ctx, scene, ob_src, dm_src_mask);
+	dm_src = dm_dst ? ob_src->derivedFinal : mesh_get_derived_final(depsgraph, scene, ob_src, dm_src_mask);
 	if (!dm_src) {
 		return changed;
 	}
@@ -1458,7 +1458,7 @@ bool BKE_object_data_transfer_dm(
 }
 
 bool BKE_object_data_transfer_mesh(
-        const struct EvaluationContext *eval_ctx, Scene *scene, Object *ob_src, Object *ob_dst, const int data_types,
+        struct Depsgraph *depsgraph, Scene *scene, Object *ob_src, Object *ob_dst, const int data_types,
         const bool use_create, const int map_vert_mode, const int map_edge_mode, const int map_loop_mode,
         const int map_poly_mode, SpaceTransform *space_transform, const bool auto_transform,
         const float max_distance, const float ray_radius, const float islands_handling_precision,
@@ -1467,7 +1467,7 @@ bool BKE_object_data_transfer_mesh(
         ReportList *reports)
 {
 	return BKE_object_data_transfer_dm(
-	        eval_ctx, scene, ob_src, ob_dst, NULL, data_types, use_create,
+	        depsgraph, scene, ob_src, ob_dst, NULL, data_types, use_create,
 	        map_vert_mode, map_edge_mode, map_loop_mode, map_poly_mode,
 	        space_transform, auto_transform,
 	        max_distance, ray_radius, islands_handling_precision,