Merge remote-tracking branch 'origin/blender2.8' into render-layers

119 files changed, 909 insertions, 5240 deletions

diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index be983ebff4a..a8519f54d0a 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -339,7 +339,7 @@ OSL_FORCE_REBUILD=false
 OSL_SKIP=false
 
 # OpenSubdiv needs to be compiled for now
-OSD_VERSION="3.1.0"
+OSD_VERSION="3.1.1"
 OSD_VERSION_MIN=$OSD_VERSION
 OSD_FORCE_BUILD=false
 OSD_FORCE_REBUILD=false
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index e8154f9ea66..ec3131ca19e 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -1632,13 +1632,9 @@ def write_sphinx_conf_py(basepath):
     file = open(filepath, "w", encoding="utf-8")
     fw = file.write
 
-    fw("import sys, os\n")
-    fw("\n")
-    fw("extensions = ['sphinx.ext.intersphinx']\n")
-    fw("\n")
-    fw("intersphinx_mapping = {'blender_manual': ('https://www.blender.org/manual/', None)}\n")
-    fw("\n")
-
+    fw("import sys, os\n\n")
+    fw("extensions = ['sphinx.ext.intersphinx']\n\n")
+    fw("intersphinx_mapping = {'blender_manual': ('https://docs.blender.org/manual/en/dev/', None)}\n\n")
     fw("project = 'Blender'\n")
     # fw("master_doc = 'index'\n")
     fw("copyright = u'Blender Foundation'\n")
diff --git a/doc/python_api/sphinx_doc_update.py b/doc/python_api/sphinx_doc_update.py
index c7f0367a2a0..3d48c1145e1 100755
--- a/doc/python_api/sphinx_doc_update.py
+++ b/doc/python_api/sphinx_doc_update.py
@@ -41,9 +41,9 @@ import tempfile
 import zipfile
 
 
-DEFAULT_RSYNC_SERVER = "www.blender.org"
+DEFAULT_RSYNC_SERVER = "docs.blender.org"
 DEFAULT_RSYNC_ROOT = "/api/"
-DEFAULT_SYMLINK_ROOT = "/data/www/vhosts/www.blender.org/api"
+DEFAULT_SYMLINK_ROOT = "/data/www/vhosts/docs.blender.org/api"
 
 
 def argparse_create():
diff --git a/extern/gflags/README.blender b/extern/gflags/README.blender
index 0c8ea9a2be3..b48d4d5d110 100644
--- a/extern/gflags/README.blender
+++ b/extern/gflags/README.blender
@@ -18,6 +18,8 @@ Local modifications:
 - Applied some modifications from fork https://github.com/Nazg-Gul/gflags.git
   (see https://github.com/gflags/gflags/pull/129)
 
-- Avoid attemot of acquiring mutex lock in FlagRegistry::GlobalRegistry when
+- Avoid attempt of acquiring mutex lock in FlagRegistry::GlobalRegistry when
   doing static flags initialization. See d81dd2d in Blender repository.
 
+- Made `google::{anonymous}::FlagValue::ValueSize() const` inlined, so it does
+  not trigger strict compiler warning.
\ No newline at end of file
diff --git a/extern/gflags/src/gflags.cc b/extern/gflags/src/gflags.cc
index 7abe1f70da3..6dcc5170bcc 100644
--- a/extern/gflags/src/gflags.cc
+++ b/extern/gflags/src/gflags.cc
@@ -218,7 +218,7 @@ class FlagValue {
   bool Equal(const FlagValue& x) const;
   FlagValue* New() const;   // creates a new one with default value
   void CopyFrom(const FlagValue& x);
-  int ValueSize() const;
+  inline int ValueSize() const;
 
   // Calls the given validate-fn on value_buffer_, and returns
   // whatever it returns.  But first casts validate_fn_proto to a
@@ -443,7 +443,7 @@ void FlagValue::CopyFrom(const FlagValue& x) {
   }
 }
 
-int FlagValue::ValueSize() const {
+inline int FlagValue::ValueSize() const {
   if (type_ > FV_MAX_INDEX) {
     assert(false);  // unknown type
     return 0;
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py
index 1fc3758ad4d..235d19e91e8 100644
--- a/intern/cycles/blender/addon/__init__.py
+++ b/intern/cycles/blender/addon/__init__.py
@@ -23,7 +23,7 @@ bl_info = {
     "location": "Info header, render engine menu",
     "description": "Cycles Render Engine integration",
     "warning": "",
-    "wiki_url": "https://www.blender.org/manual/render/cycles/index.html",
+    "wiki_url": "https://docs.blender.org/manual/en/dev/render/cycles/",
     "tracker_url": "",
     "support": 'OFFICIAL',
     "category": "Render"}
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 7a59698e15e..a1e78623d29 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -217,7 +217,7 @@ class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel):
         draw_samples_info(layout, context)
 
 
-class CyclesRender_PT_geometery(CyclesButtonsPanel, Panel):
+class CyclesRender_PT_geometry(CyclesButtonsPanel, Panel):
     bl_label = "Geometry"
     bl_options = {'DEFAULT_CLOSED'}
 
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 233f94be1bf..dafac6dfcb3 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -130,7 +130,7 @@ public:
 	{
 		if(first_error) {
 			fprintf(stderr, "\nRefer to the Cycles GPU rendering documentation for possible solutions:\n");
-			fprintf(stderr, "http://www.blender.org/manual/render/cycles/gpu_rendering.html\n\n");
+			fprintf(stderr, "https://docs.blender.org/manual/en/dev/render/cycles/gpu_rendering.html\n\n");
 			first_error = false;
 		}
 	}
diff --git a/intern/cycles/kernel/bvh/bvh_subsurface.h b/intern/cycles/kernel/bvh/bvh_subsurface.h
index d9623c94b2e..889bbca21e2 100644
--- a/intern/cycles/kernel/bvh/bvh_subsurface.h
+++ b/intern/cycles/kernel/bvh/bvh_subsurface.h
@@ -72,7 +72,7 @@ void BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 	ss_isect->num_hits = 0;
 
 	const int object_flag = kernel_tex_fetch(__object_flag, subsurface_object);
-	if(!(object_flag & SD_TRANSFORM_APPLIED)) {
+	if(!(object_flag & SD_OBJECT_TRANSFORM_APPLIED)) {
 #if BVH_FEATURE(BVH_MOTION)
 		Transform ob_itfm;
 		bvh_instance_motion_push(kg,
diff --git a/intern/cycles/kernel/bvh/bvh_volume.h b/intern/cycles/kernel/bvh/bvh_volume.h
index 107373c17dc..57e5b8d736d 100644
--- a/intern/cycles/kernel/bvh/bvh_volume.h
+++ b/intern/cycles/kernel/bvh/bvh_volume.h
@@ -236,9 +236,7 @@ bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 					/* instance push */
 					object = kernel_tex_fetch(__prim_object, -prim_addr-1);
 					int object_flag = kernel_tex_fetch(__object_flag, object);
-
 					if(object_flag & SD_OBJECT_HAS_VOLUME) {
-
 #  if BVH_FEATURE(BVH_MOTION)
 						bvh_instance_motion_push(kg, object, ray, &P, &dir, &idir, &isect->t, &ob_itfm);
 #  else
diff --git a/intern/cycles/kernel/bvh/bvh_volume_all.h b/intern/cycles/kernel/bvh/bvh_volume_all.h
index 529848ebe7b..5a1accebaa0 100644
--- a/intern/cycles/kernel/bvh/bvh_volume_all.h
+++ b/intern/cycles/kernel/bvh/bvh_volume_all.h
@@ -287,7 +287,6 @@ uint BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
 					/* instance push */
 					object = kernel_tex_fetch(__prim_object, -prim_addr-1);
 					int object_flag = kernel_tex_fetch(__object_flag, object);
-
 					if(object_flag & SD_OBJECT_HAS_VOLUME) {
 
 #  if BVH_FEATURE(BVH_MOTION)
diff --git a/intern/cycles/kernel/bvh/qbvh_subsurface.h b/intern/cycles/kernel/bvh/qbvh_subsurface.h
index ccd36df034a..84dc4003133 100644
--- a/intern/cycles/kernel/bvh/qbvh_subsurface.h
+++ b/intern/cycles/kernel/bvh/qbvh_subsurface.h
@@ -61,7 +61,7 @@ ccl_device void BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg,
 	ss_isect->num_hits = 0;
 
 	const int object_flag = kernel_tex_fetch(__object_flag, subsurface_object);
-	if(!(object_flag & SD_TRANSFORM_APPLIED)) {
+	if(!(object_flag & SD_OBJECT_TRANSFORM_APPLIED)) {
 #if BVH_FEATURE(BVH_MOTION)
 		Transform ob_itfm;
 		bvh_instance_motion_push(kg,
diff --git a/intern/cycles/kernel/bvh/qbvh_volume.h b/intern/cycles/kernel/bvh/qbvh_volume.h
index 1e77d8e67ec..dc6627e2dbb 100644
--- a/intern/cycles/kernel/bvh/qbvh_volume.h
+++ b/intern/cycles/kernel/bvh/qbvh_volume.h
@@ -293,7 +293,6 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg,
 					/* Instance push. */
 					object = kernel_tex_fetch(__prim_object, -prim_addr-1);
 					int object_flag = kernel_tex_fetch(__object_flag, object);
-
 					if(object_flag & SD_OBJECT_HAS_VOLUME) {
 #  if BVH_FEATURE(BVH_MOTION)
 						bvh_instance_motion_push(kg, object, ray, &P, &dir, &idir, &isect->t, &ob_itfm);
diff --git a/intern/cycles/kernel/bvh/qbvh_volume_all.h b/intern/cycles/kernel/bvh/qbvh_volume_all.h
index eb48af6fc68..ff1fa92af6e 100644
--- a/intern/cycles/kernel/bvh/qbvh_volume_all.h
+++ b/intern/cycles/kernel/bvh/qbvh_volume_all.h
@@ -344,9 +344,7 @@ ccl_device uint BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg,
 					/* Instance push. */
 					object = kernel_tex_fetch(__prim_object, -prim_addr-1);
 					int object_flag = kernel_tex_fetch(__object_flag, object);
-
 					if(object_flag & SD_OBJECT_HAS_VOLUME) {
-
 #  if BVH_FEATURE(BVH_MOTION)
 						bvh_instance_motion_push(kg, object, ray, &P, &dir, &idir, &isect_t, &ob_itfm);
 #  else
diff --git a/intern/cycles/kernel/geom/geom_motion_triangle_shader.h b/intern/cycles/kernel/geom/geom_motion_triangle_shader.h
index c5dbc6a2f52..0e024a05db6 100644
--- a/intern/cycles/kernel/geom/geom_motion_triangle_shader.h
+++ b/intern/cycles/kernel/geom/geom_motion_triangle_shader.h
@@ -81,7 +81,7 @@ ccl_device_noinline void motion_triangle_shader_setup(KernelGlobals *kg,
 	}
 	/* Compute face normal. */
 	float3 Ng;
-	if(ccl_fetch(sd, flag) & SD_NEGATIVE_SCALE_APPLIED) {
+	if(ccl_fetch(sd, object_flag) & SD_OBJECT_NEGATIVE_SCALE_APPLIED) {
 		Ng = normalize(cross(verts[2] - verts[0], verts[1] - verts[0]));
 	}
 	else {
diff --git a/intern/cycles/kernel/geom/geom_object.h b/intern/cycles/kernel/geom/geom_object.h
index 9f0fe032ba4..f51b2d18657 100644
--- a/intern/cycles/kernel/geom/geom_object.h
+++ b/intern/cycles/kernel/geom/geom_object.h
@@ -113,7 +113,6 @@ ccl_device_inline Transform object_fetch_transform_motion(KernelGlobals *kg, int
 ccl_device_inline Transform object_fetch_transform_motion_test(KernelGlobals *kg, int object, float time, Transform *itfm)
 {
 	int object_flag = kernel_tex_fetch(__object_flag, object);
-
 	if(object_flag & SD_OBJECT_MOTION) {
 		/* if we do motion blur */
 		Transform tfm = object_fetch_transform_motion(kg, object, time);
diff --git a/intern/cycles/kernel/geom/geom_primitive.h b/intern/cycles/kernel/geom/geom_primitive.h
index 4384c2093e9..8a73bb2f78b 100644
--- a/intern/cycles/kernel/geom/geom_primitive.h
+++ b/intern/cycles/kernel/geom/geom_primitive.h
@@ -157,8 +157,9 @@ ccl_device_inline float4 primitive_motion_vector(KernelGlobals *kg, ShaderData *
 	if(is_curve_primitive) {
 		center = curve_motion_center_location(kg, sd);
 
-		if(!(ccl_fetch(sd, flag) & SD_TRANSFORM_APPLIED))
+		if(!(ccl_fetch(sd, object_flag) & SD_OBJECT_TRANSFORM_APPLIED)) {
 			object_position_transform(kg, sd, &center);
+		}
 	}
 	else
 #endif
@@ -181,7 +182,7 @@ ccl_device_inline float4 primitive_motion_vector(KernelGlobals *kg, ShaderData *
 		motion_post = primitive_attribute_float3(kg, sd, desc, NULL, NULL);
 
 #ifdef __HAIR__
-		if(is_curve_primitive && (ccl_fetch(sd, flag) & SD_OBJECT_HAS_VERTEX_MOTION) == 0) {
+		if(is_curve_primitive && (ccl_fetch(sd, object_flag) & SD_OBJECT_HAS_VERTEX_MOTION) == 0) {
 			object_position_transform(kg, sd, &motion_pre);
 			object_position_transform(kg, sd, &motion_post);
 		}
diff --git a/intern/cycles/kernel/geom/geom_triangle.h b/intern/cycles/kernel/geom/geom_triangle.h
index 17538872ead..3229091bbb0 100644
--- a/intern/cycles/kernel/geom/geom_triangle.h
+++ b/intern/cycles/kernel/geom/geom_triangle.h
@@ -32,10 +32,12 @@ ccl_device_inline float3 triangle_normal(KernelGlobals *kg, ShaderData *sd)
 	const float3 v2 = float4_to_float3(kernel_tex_fetch(__prim_tri_verts, tri_vindex.w+2));
 
 	/* return normal */
-	if(ccl_fetch(sd, flag) & SD_NEGATIVE_SCALE_APPLIED)
+	if(ccl_fetch(sd, object_flag) & SD_OBJECT_NEGATIVE_SCALE_APPLIED) {
 		return normalize(cross(v2 - v0, v1 - v0));
-	else
+	}
+	else {
 		return normalize(cross(v1 - v0, v2 - v0));
+	}
 }
 
 /* point and normal on triangle  */
@@ -46,20 +48,18 @@ ccl_device_inline void triangle_point_normal(KernelGlobals *kg, int object, int
 	float3 v0 = float4_to_float3(kernel_tex_fetch(__prim_tri_verts, tri_vindex.w+0));
 	float3 v1 = float4_to_float3(kernel_tex_fetch(__prim_tri_verts, tri_vindex.w+1));
 	float3 v2 = float4_to_float3(kernel_tex_fetch(__prim_tri_verts, tri_vindex.w+2));
-
 	/* compute point */
 	float t = 1.0f - u - v;
 	*P = (u*v0 + v*v1 + t*v2);
-
 	/* get object flags */
 	int object_flag = kernel_tex_fetch(__object_flag, object);
-
 	/* compute normal */
-	if(object_flag & SD_NEGATIVE_SCALE_APPLIED)
+	if(object_flag & SD_OBJECT_NEGATIVE_SCALE_APPLIED) {
 		*Ng = normalize(cross(v2 - v0, v1 - v0));
-	else
+	}
+	else {
 		*Ng = normalize(cross(v1 - v0, v2 - v0));
-
+	}
 	/* shader`*/
 	*shader = kernel_tex_fetch(__tri_shader, prim);
 }
diff --git a/intern/cycles/kernel/kernel_bake.h b/intern/cycles/kernel/kernel_bake.h
index c32ac6ccf41..5bcc57cdcdf 100644
--- a/intern/cycles/kernel/kernel_bake.h
+++ b/intern/cycles/kernel/kernel_bake.h
@@ -320,7 +320,7 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
 	                         P, Ng, Ng,
 	                         shader, object, prim,
 	                         u, v, 1.0f, 0.5f,
-	                         !(kernel_tex_fetch(__object_flag, object) & SD_TRANSFORM_APPLIED),
+	                         !(kernel_tex_fetch(__object_flag, object) & SD_OBJECT_TRANSFORM_APPLIED),
 	                         LAMP_NONE);
 	sd.I = sd.N;
 
diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h
index d4cc36d1495..a2909cec1a1 100644
--- a/intern/cycles/kernel/kernel_light.h
+++ b/intern/cycles/kernel/kernel_light.h
@@ -767,7 +767,7 @@ ccl_device void object_transform_light_sample(KernelGlobals *kg, LightSample *ls
 {
 #ifdef __INSTANCING__
 	/* instance transform */
-	if(!(kernel_tex_fetch(__object_flag, object) & SD_TRANSFORM_APPLIED)) {
+	if(!(kernel_tex_fetch(__object_flag, object) & SD_OBJECT_TRANSFORM_APPLIED)) {
 #  ifdef __OBJECT_MOTION__
 		Transform itfm;
 		Transform tfm = object_fetch_transform_motion_test(kg, object, time, &itfm);
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h
index e25f2597366..8ce9a4f02ec 100644
--- a/intern/cycles/kernel/kernel_path.h
+++ b/intern/cycles/kernel/kernel_path.h
@@ -452,7 +452,7 @@ bool kernel_path_subsurface_scatter(
 #  ifdef __VOLUME__
 		ss_indirect->need_update_volume_stack =
 		        kernel_data.integrator.use_volumes &&
-		        ccl_fetch(sd, flag) & SD_OBJECT_INTERSECTS_VOLUME;
+		        ccl_fetch(sd, object_flag) & SD_OBJECT_INTERSECTS_VOLUME;
 #  endif  /* __VOLUME__ */
 
 		/* compute lighting with the BSDF closure */
@@ -777,21 +777,25 @@ ccl_device_inline float4 kernel_path_integrate(KernelGlobals *kg,
 
 		/* holdout */
 #ifdef __HOLDOUT__
-		if((sd.flag & (SD_HOLDOUT|SD_HOLDOUT_MASK)) && (state.flag & PATH_RAY_CAMERA)) {
+		if(((sd.flag & SD_HOLDOUT) ||
+		    (sd.object_flag & SD_OBJECT_HOLDOUT_MASK)) &&
+		   (state.flag & PATH_RAY_CAMERA))
+		{
 			if(kernel_data.background.transparent) {
 				float3 holdout_weight;
-				
-				if(sd.flag & SD_HOLDOUT_MASK)
+				if(sd.object_flag & SD_OBJECT_HOLDOUT_MASK) {
 					holdout_weight = make_float3(1.0f, 1.0f, 1.0f);
-				else
+				}
+				else {
 					holdout_weight = shader_holdout_eval(kg, &sd);
-
+				}
 				/* any throughput is ok, should all be identical here */
 				L_transparent += average(holdout_weight*throughput);
 			}
 
-			if(sd.flag & SD_HOLDOUT_MASK)
+			if(sd.object_flag & SD_OBJECT_HOLDOUT_MASK) {
 				break;
+			}
 		}
 #endif  /* __HOLDOUT__ */
 
diff --git a/intern/cycles/kernel/kernel_path_branched.h b/intern/cycles/kernel/kernel_path_branched.h
index 72a8d98ac00..ff2b828795d 100644
--- a/intern/cycles/kernel/kernel_path_branched.h
+++ b/intern/cycles/kernel/kernel_path_branched.h
@@ -167,8 +167,9 @@ ccl_device void kernel_branched_path_subsurface_scatter(KernelGlobals *kg,
 			                                                  true);
 #ifdef __VOLUME__
 			Ray volume_ray = *ray;
-			bool need_update_volume_stack = kernel_data.integrator.use_volumes &&
-			                                ccl_fetch(sd, flag) & SD_OBJECT_INTERSECTS_VOLUME;
+			bool need_update_volume_stack =
+			        kernel_data.integrator.use_volumes &&
+			        ccl_fetch(sd, object_flag) & SD_OBJECT_INTERSECTS_VOLUME;
 #endif  /* __VOLUME__ */
 
 			/* compute lighting with the BSDF closure */
@@ -473,21 +474,21 @@ ccl_device float4 kernel_branched_path_integrate(KernelGlobals *kg, RNG *rng, in
 
 		/* holdout */
 #ifdef __HOLDOUT__
-		if(sd.flag & (SD_HOLDOUT|SD_HOLDOUT_MASK)) {
+		if((sd.flag & SD_HOLDOUT) || (sd.object_flag & SD_OBJECT_HOLDOUT_MASK)) {
 			if(kernel_data.background.transparent) {
 				float3 holdout_weight;
-				
-				if(sd.flag & SD_HOLDOUT_MASK)
+				if(sd.object_flag & SD_OBJECT_HOLDOUT_MASK) {
 					holdout_weight = make_float3(1.0f, 1.0f, 1.0f);
-				else
+				}
+				else {
 					holdout_weight = shader_holdout_eval(kg, &sd);
-
+				}
 				/* any throughput is ok, should all be identical here */
 				L_transparent += average(holdout_weight*throughput);
 			}
-
-			if(sd.flag & SD_HOLDOUT_MASK)
+			if(sd.object_flag & SD_OBJECT_HOLDOUT_MASK) {
 				break;
+			}
 		}
 #endif  /* __HOLDOUT__ */
 
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h
index c1b3153d8fe..d0826e5e879 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -38,7 +38,7 @@ CCL_NAMESPACE_BEGIN
 #ifdef __OBJECT_MOTION__
 ccl_device void shader_setup_object_transforms(KernelGlobals *kg, ShaderData *sd, float time)
 {
-	if(ccl_fetch(sd, flag) & SD_OBJECT_MOTION) {
+	if(ccl_fetch(sd, object_flag) & SD_OBJECT_MOTION) {
 		ccl_fetch(sd, ob_tfm) = object_fetch_transform_motion(kg, ccl_fetch(sd, object), time);
 		ccl_fetch(sd, ob_itfm) = transform_quick_inverse(ccl_fetch(sd, ob_tfm));
 	}
@@ -59,7 +59,9 @@ ccl_device_noinline void shader_setup_from_ray(KernelGlobals *kg,
 #endif
 
 	ccl_fetch(sd, type) = isect->type;
-	ccl_fetch(sd, flag) = kernel_tex_fetch(__object_flag, ccl_fetch(sd, object));
+	ccl_fetch(sd, flag) = 0;
+	ccl_fetch(sd, object_flag) = kernel_tex_fetch(__object_flag,
+	                                              ccl_fetch(sd, object));
 
 	/* matrices and time */
 #ifdef __OBJECT_MOTION__
@@ -160,10 +162,11 @@ void shader_setup_from_subsurface(
         const Intersection *isect,
         const Ray *ray)
 {
-	bool backfacing = sd->flag & SD_BACKFACING;
+	const bool backfacing = sd->flag & SD_BACKFACING;
 
 	/* object, matrices, time, ray_length stay the same */
-	sd->flag = kernel_tex_fetch(__object_flag, sd->object);
+	sd->flag = 0;
+	sd->object_flag = kernel_tex_fetch(__object_flag, sd->object);
 	sd->prim = kernel_tex_fetch(__prim_index, isect->prim);
 	sd->type = isect->type;
 
@@ -271,8 +274,10 @@ ccl_device_inline void shader_setup_from_sample(KernelGlobals *kg,
 	ccl_fetch(sd, ray_length) = t;
 
 	ccl_fetch(sd, flag) = kernel_tex_fetch(__shader_flag, (ccl_fetch(sd, shader) & SHADER_MASK)*SHADER_SIZE);
+	ccl_fetch(sd, object_flag) = 0;
 	if(ccl_fetch(sd, object) != OBJECT_NONE) {
-		ccl_fetch(sd, flag) |= kernel_tex_fetch(__object_flag, ccl_fetch(sd, object));
+		ccl_fetch(sd, object_flag) |= kernel_tex_fetch(__object_flag,
+		                                               ccl_fetch(sd, object));
 
 #ifdef __OBJECT_MOTION__
 		shader_setup_object_transforms(kg, sd, time);
@@ -298,7 +303,7 @@ ccl_device_inline void shader_setup_from_sample(KernelGlobals *kg,
 			ccl_fetch(sd, N) = triangle_smooth_normal(kg, ccl_fetch(sd, prim), ccl_fetch(sd, u), ccl_fetch(sd, v));
 
 #ifdef __INSTANCING__
-			if(!(ccl_fetch(sd, flag) & SD_TRANSFORM_APPLIED)) {
+			if(!(ccl_fetch(sd, object_flag) & SD_OBJECT_TRANSFORM_APPLIED)) {
 				object_normal_transform_auto(kg, sd, &ccl_fetch(sd, N));
 			}
 #endif
@@ -309,7 +314,7 @@ ccl_device_inline void shader_setup_from_sample(KernelGlobals *kg,
 		triangle_dPdudv(kg, ccl_fetch(sd, prim), &ccl_fetch(sd, dPdu), &ccl_fetch(sd, dPdv));
 
 #  ifdef __INSTANCING__
-		if(!(ccl_fetch(sd, flag) & SD_TRANSFORM_APPLIED)) {
+		if(!(ccl_fetch(sd, object_flag) & SD_OBJECT_TRANSFORM_APPLIED)) {
 			object_dir_transform_auto(kg, sd, &ccl_fetch(sd, dPdu));
 			object_dir_transform_auto(kg, sd, &ccl_fetch(sd, dPdv));
 		}
@@ -364,7 +369,7 @@ ccl_device void shader_setup_from_displace(KernelGlobals *kg, ShaderData *sd,
 	                         P, Ng, I,
 	                         shader, object, prim,
 	                         u, v, 0.0f, 0.5f,
-	                         !(kernel_tex_fetch(__object_flag, object) & SD_TRANSFORM_APPLIED),
+	                         !(kernel_tex_fetch(__object_flag, object) & SD_OBJECT_TRANSFORM_APPLIED),
 	                         LAMP_NONE);
 }
 
@@ -379,6 +384,7 @@ ccl_device_inline void shader_setup_from_background(KernelGlobals *kg, ShaderDat
 	ccl_fetch(sd, I) = -ray->D;
 	ccl_fetch(sd, shader) = kernel_data.background.surface_shader;
 	ccl_fetch(sd, flag) = kernel_tex_fetch(__shader_flag, (ccl_fetch(sd, shader) & SHADER_MASK)*SHADER_SIZE);
+	ccl_fetch(sd, object_flag) = 0;
 #ifdef __OBJECT_MOTION__
 	ccl_fetch(sd, time) = ray->time;
 #endif
@@ -420,6 +426,7 @@ ccl_device_inline void shader_setup_from_volume(KernelGlobals *kg, ShaderData *s
 	sd->I = -ray->D;
 	sd->shader = SHADER_NONE;
 	sd->flag = 0;
+	sd->object_flag = 0;
 #ifdef __OBJECT_MOTION__
 	sd->time = ray->time;
 #endif
@@ -1027,6 +1034,7 @@ ccl_device_inline void shader_eval_volume(KernelGlobals *kg,
 	sd->num_closure = 0;
 	sd->num_closure_extra = 0;
 	sd->flag = 0;
+	sd->object_flag = 0;
 
 	for(int i = 0; stack[i].shader != SHADER_NONE; i++) {
 		/* setup shaderdata from stack. it's mostly setup already in
@@ -1034,11 +1042,12 @@ ccl_device_inline void shader_eval_volume(KernelGlobals *kg,
 		sd->object = stack[i].object;
 		sd->shader = stack[i].shader;
 
-		sd->flag &= ~(SD_SHADER_FLAGS|SD_OBJECT_FLAGS);
+		sd->flag &= ~SD_SHADER_FLAGS;
 		sd->flag |= kernel_tex_fetch(__shader_flag, (sd->shader & SHADER_MASK)*SHADER_SIZE);
+		sd->object_flag &= ~SD_OBJECT_FLAGS;
 
 		if(sd->object != OBJECT_NONE) {
-			sd->flag |= kernel_tex_fetch(__object_flag, sd->object);
+			sd->object_flag |= kernel_tex_fetch(__object_flag, sd->object);
 
 #ifdef __OBJECT_MOTION__
 			/* todo: this is inefficient for motion blur, we should be
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 4180465d1a1..b7af90cd739 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -692,56 +692,108 @@ typedef enum ShaderContext {
 /* Shader Data
  *
  * Main shader state at a point on the surface or in a volume. All coordinates
- * are in world space. */
+ * are in world space.
+ */
 
 enum ShaderDataFlag {
-	/* runtime flags */
-	SD_BACKFACING      = (1 << 0),   /* backside of surface? */
-	SD_EMISSION        = (1 << 1),   /* have emissive closure? */
-	SD_BSDF            = (1 << 2),   /* have bsdf closure? */
-	SD_BSDF_HAS_EVAL   = (1 << 3),   /* have non-singular bsdf closure? */
-	SD_BSSRDF          = (1 << 4),   /* have bssrdf */
-	SD_HOLDOUT         = (1 << 5),   /* have holdout closure? */
-	SD_ABSORPTION      = (1 << 6),   /* have volume absorption closure? */
-	SD_SCATTER         = (1 << 7),   /* have volume phase closure? */
-	SD_AO              = (1 << 8),   /* have ao closure? */
-	SD_TRANSPARENT     = (1 << 9),  /* have transparent closure? */
+	/* Runtime flags. */
+
+	/* Set when ray hits backside of surface. */
+	SD_BACKFACING      = (1 << 0),
+	/* Shader has emissive closure. */
+	SD_EMISSION        = (1 << 1),
+	/* Shader has BSDF closure. */
+	SD_BSDF            = (1 << 2),
+	/* Shader has non-singular BSDF closure. */
+	SD_BSDF_HAS_EVAL   = (1 << 3),
+	/* Shader has BSSRDF closure. */
+	SD_BSSRDF          = (1 << 4),
+	/* Shader has holdout closure. */
+	SD_HOLDOUT         = (1 << 5),
+	/* Shader has volume absorption closure. */
+	SD_ABSORPTION      = (1 << 6),
+	/* Shader has have volume phase (scatter) closure. */
+	SD_SCATTER         = (1 << 7),
+	/* Shader has AO closure. */
+	SD_AO              = (1 << 8),
+	/* Shader has transparent closure. */
+	SD_TRANSPARENT     = (1 << 9),
+	/* BSDF requires LCG for evaluation. */
 	SD_BSDF_NEEDS_LCG  = (1 << 10),
 
-	SD_CLOSURE_FLAGS = (SD_EMISSION|SD_BSDF|SD_BSDF_HAS_EVAL|SD_BSSRDF|
-	                    SD_HOLDOUT|SD_ABSORPTION|SD_SCATTER|SD_AO|
+	SD_CLOSURE_FLAGS = (SD_EMISSION |
+	                    SD_BSDF |
+	                    SD_BSDF_HAS_EVAL |
+	                    SD_BSSRDF |
+	                    SD_HOLDOUT |
+	                    SD_ABSORPTION |
+	                    SD_SCATTER |
+	                    SD_AO |
 	                    SD_BSDF_NEEDS_LCG),
 
-	/* shader flags */
-	SD_USE_MIS                = (1 << 12),  /* direct light sample */
-	SD_HAS_TRANSPARENT_SHADOW = (1 << 13),  /* has transparent shadow */
-	SD_HAS_VOLUME             = (1 << 14),  /* has volume shader */
-	SD_HAS_ONLY_VOLUME        = (1 << 15),  /* has only volume shader, no surface */
-	SD_HETEROGENEOUS_VOLUME   = (1 << 16),  /* has heterogeneous volume */
-	SD_HAS_BSSRDF_BUMP        = (1 << 17),  /* bssrdf normal uses bump */
-	SD_VOLUME_EQUIANGULAR     = (1 << 18),  /* use equiangular sampling */
-	SD_VOLUME_MIS             = (1 << 19),  /* use multiple importance sampling */
-	SD_VOLUME_CUBIC           = (1 << 20),  /* use cubic interpolation for voxels */
-	SD_HAS_BUMP               = (1 << 21),  /* has data connected to the displacement input */
-	SD_HAS_DISPLACEMENT       = (1 << 22),  /* has true displacement */
-	SD_HAS_CONSTANT_EMISSION  = (1 << 23),  /* has constant emission (value stored in __shader_flag) */
-
-	SD_SHADER_FLAGS = (SD_USE_MIS|SD_HAS_TRANSPARENT_SHADOW|SD_HAS_VOLUME|
-	                   SD_HAS_ONLY_VOLUME|SD_HETEROGENEOUS_VOLUME|
-	                   SD_HAS_BSSRDF_BUMP|SD_VOLUME_EQUIANGULAR|SD_VOLUME_MIS|
-	                   SD_VOLUME_CUBIC|SD_HAS_BUMP|SD_HAS_DISPLACEMENT|SD_HAS_CONSTANT_EMISSION),
-
-	/* object flags */
-	SD_HOLDOUT_MASK             = (1 << 24),  /* holdout for camera rays */
-	SD_OBJECT_MOTION            = (1 << 25),  /* has object motion blur */
-	SD_TRANSFORM_APPLIED        = (1 << 26),  /* vertices have transform applied */
-	SD_NEGATIVE_SCALE_APPLIED   = (1 << 27),  /* vertices have negative scale applied */
-	SD_OBJECT_HAS_VOLUME        = (1 << 28),  /* object has a volume shader */
-	SD_OBJECT_INTERSECTS_VOLUME = (1 << 29),  /* object intersects AABB of an object with volume shader */
-	SD_OBJECT_HAS_VERTEX_MOTION = (1 << 30),  /* has position for motion vertices */
-
-	SD_OBJECT_FLAGS = (SD_HOLDOUT_MASK|SD_OBJECT_MOTION|SD_TRANSFORM_APPLIED|
-	                   SD_NEGATIVE_SCALE_APPLIED|SD_OBJECT_HAS_VOLUME|
+	/* Shader flags. */
+
+	/* direct light sample */
+	SD_USE_MIS                = (1 << 16),
+	/* Has transparent shadow. */
+	SD_HAS_TRANSPARENT_SHADOW = (1 << 17),
+	/* Has volume shader. */
+	SD_HAS_VOLUME             = (1 << 18),
+	/* Has only volume shader, no surface. */
+	SD_HAS_ONLY_VOLUME        = (1 << 19),
+	/* Has heterogeneous volume. */
+	SD_HETEROGENEOUS_VOLUME   = (1 << 20),
+	/* BSSRDF normal uses bump. */
+	SD_HAS_BSSRDF_BUMP        = (1 << 21),
+	/* Use equiangular volume sampling */
+	SD_VOLUME_EQUIANGULAR     = (1 << 22),
+	/* Use multiple importance volume sampling. */
+	SD_VOLUME_MIS             = (1 << 23),
+	/* Use cubic interpolation for voxels. */
+	SD_VOLUME_CUBIC           = (1 << 24),
+	/* Has data connected to the displacement input. */
+	SD_HAS_BUMP               = (1 << 25),
+	/* Has true displacement. */
+	SD_HAS_DISPLACEMENT       = (1 << 26),
+	/* Has constant emission (value stored in __shader_flag) */
+	SD_HAS_CONSTANT_EMISSION  = (1 << 27),
+
+	SD_SHADER_FLAGS = (SD_USE_MIS |
+	                   SD_HAS_TRANSPARENT_SHADOW |
+	                   SD_HAS_VOLUME |
+	                   SD_HAS_ONLY_VOLUME |
+	                   SD_HETEROGENEOUS_VOLUME|
+	                   SD_HAS_BSSRDF_BUMP |
+	                   SD_VOLUME_EQUIANGULAR |
+	                   SD_VOLUME_MIS |
+	                   SD_VOLUME_CUBIC |
+	                   SD_HAS_BUMP |
+	                   SD_HAS_DISPLACEMENT |
+	                   SD_HAS_CONSTANT_EMISSION)
+};
+
+	/* Object flags. */
+enum ShaderDataObjectFlag {
+	/* Holdout for camera rays. */
+	SD_OBJECT_HOLDOUT_MASK           = (1 << 0),
+	/* Has object motion blur. */
+	SD_OBJECT_MOTION                 = (1 << 1),
+	/* Vertices have transform applied. */
+	SD_OBJECT_TRANSFORM_APPLIED      = (1 << 2),
+	/* Vertices have negative scale applied. */
+	SD_OBJECT_NEGATIVE_SCALE_APPLIED = (1 << 3),
+	/* Object has a volume shader. */
+	SD_OBJECT_HAS_VOLUME             = (1 << 4),
+	/* Object intersects AABB of an object with volume shader. */
+	SD_OBJECT_INTERSECTS_VOLUME      = (1 << 5),
+	/* Has position for motion vertices. */
+	SD_OBJECT_HAS_VERTEX_MOTION      = (1 << 6),
+
+	SD_OBJECT_FLAGS = (SD_OBJECT_HOLDOUT_MASK |
+	                   SD_OBJECT_MOTION |
+	                   SD_OBJECT_TRANSFORM_APPLIED |
+	                   SD_OBJECT_NEGATIVE_SCALE_APPLIED |
+	                   SD_OBJECT_HAS_VOLUME |
 	                   SD_OBJECT_INTERSECTS_VOLUME)
 };
 
@@ -780,6 +832,8 @@ typedef ccl_addr_space struct ShaderData {
 	ccl_soa_member(int, shader);
 	/* booleans describing shader, see ShaderDataFlag */
 	ccl_soa_member(int, flag);
+	/* booleans describing object of the shader, see ShaderDataObjectFlag */
+	ccl_soa_member(int, object_flag);
 
 	/* primitive id if there is one, ~0 otherwise */
 	ccl_soa_member(int, prim);
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp
index eeccf9a9641..58bbdc33920 100644
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/osl_services.cpp
@@ -712,7 +712,7 @@ bool OSLRenderServices::get_object_standard_attribute(KernelGlobals *kg, ShaderD
 		else
 			motion_triangle_vertices(kg, sd->object, sd->prim, sd->time, P);
 
-		if(!(sd->flag & SD_TRANSFORM_APPLIED)) {
+		if(!(sd->object_flag & SD_OBJECT_TRANSFORM_APPLIED)) {
 			object_position_transform(kg, sd, &P[0]);
 			object_position_transform(kg, sd, &P[1]);
 			object_position_transform(kg, sd, &P[2]);
diff --git a/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h b/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
index 435d1171d5c..5d951b972ed 100644
--- a/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
+++ b/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
@@ -137,22 +137,22 @@ ccl_device void kernel_holdout_emission_blurring_pathtermination_ao(
 
 		/* holdout */
 #ifdef __HOLDOUT__
-		if((ccl_fetch(sd, flag) & (SD_HOLDOUT|SD_HOLDOUT_MASK)) &&
+		if(((ccl_fetch(sd, flag) & SD_HOLDOUT) ||
+		    (ccl_fetch(sd, object_flag) & SD_OBJECT_HOLDOUT_MASK)) &&
 		   (state->flag & PATH_RAY_CAMERA))
 		{
 			if(kernel_data.background.transparent) {
 				float3 holdout_weight;
-
-				if(ccl_fetch(sd, flag) & SD_HOLDOUT_MASK)
+				if(ccl_fetch(sd, object_flag) & SD_OBJECT_HOLDOUT_MASK) {
 					holdout_weight = make_float3(1.0f, 1.0f, 1.0f);
-				else
+				}
+				else {
 					holdout_weight = shader_holdout_eval(kg, sd);
-
+				}
 				/* any throughput is ok, should all be identical here */
 				L_transparent_coop[ray_index] += average(holdout_weight*throughput);
 			}
-
-			if(ccl_fetch(sd, flag) & SD_HOLDOUT_MASK) {
+			if(ccl_fetch(sd, object_flag) & SD_OBJECT_HOLDOUT_MASK) {
 				ASSIGN_RAY_STATE(ray_state, ray_index, RAY_UPDATE_BUFFER);
 				*enqueue_flag = 1;
 			}
diff --git a/intern/cycles/kernel/svm/svm_wireframe.h b/intern/cycles/kernel/svm/svm_wireframe.h
index 6eed9bc1a99..87e40791333 100644
--- a/intern/cycles/kernel/svm/svm_wireframe.h
+++ b/intern/cycles/kernel/svm/svm_wireframe.h
@@ -57,7 +57,7 @@ ccl_device_inline float wireframe(KernelGlobals *kg,
 		else
 			motion_triangle_vertices(kg, ccl_fetch(sd, object), ccl_fetch(sd, prim), ccl_fetch(sd, time), Co);
 
-		if(!(ccl_fetch(sd, flag) & SD_TRANSFORM_APPLIED)) {
+		if(!(ccl_fetch(sd, object_flag) & SD_OBJECT_TRANSFORM_APPLIED)) {
 			object_position_transform(kg, sd, &Co[0]);
 			object_position_transform(kg, sd, &Co[1]);
 			object_position_transform(kg, sd, &Co[2]);
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index c592b62829e..8342f376836 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -410,7 +410,7 @@ void ObjectManager::device_update_object_transform(UpdateObejctTransformState *s
 
 	/* Object flag. */
 	if(ob->use_holdout) {
-		flag |= SD_HOLDOUT_MASK;
+		flag |= SD_OBJECT_HOLDOUT_MASK;
 	}
 	state->object_flag[object_index] = flag;
 
@@ -716,9 +716,9 @@ void ObjectManager::apply_static_transforms(DeviceScene *dscene, Scene *scene, u
 					if(progress.get_cancel()) return;
 				}
 
-				object_flag[i] |= SD_TRANSFORM_APPLIED;
+				object_flag[i] |= SD_OBJECT_TRANSFORM_APPLIED;
 				if(object->mesh->transform_negative_scaled)
-					object_flag[i] |= SD_NEGATIVE_SCALE_APPLIED;
+					object_flag[i] |= SD_OBJECT_NEGATIVE_SCALE_APPLIED;
 			}
 			else
 				have_instancing = true;
diff --git a/intern/cycles/util/util_version.h b/intern/cycles/util/util_version.h
index 186a177d9d3..d609c739ac7 100644
--- a/intern/cycles/util/util_version.h
+++ b/intern/cycles/util/util_version.h
@@ -21,9 +21,9 @@
 
 CCL_NAMESPACE_BEGIN
 
-#define CYCLES_VERSION_MAJOR	1
-#define CYCLES_VERSION_MINOR	7
-#define CYCLES_VERSION_PATCH	0
+#define CYCLES_VERSION_MAJOR    1
+#define CYCLES_VERSION_MINOR    8
+#define CYCLES_VERSION_PATCH    1
 
 #define CYCLES_MAKE_VERSION_STRING2(a,b,c) #a "." #b "." #c
 #define CYCLES_MAKE_VERSION_STRING(a,b,c) CYCLES_MAKE_VERSION_STRING2(a,b,c)
diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject dc166057192ea882b5cc70484d4c8bacd7cb41b
+Subproject 88158191df4da2109bbfd9b0816d891bbc7fc78
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject 06dad53c80801e0e0919f086040e3d9c31bbd0a
+Subproject a746a84f8aaf3a4843eb3f4ce3f5a0464872077
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject 04af69be141a5757fc60b44cc1a5b72db524af3
+Subproject 029103debce43110f93295d7633931ec100d301
diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py
index d77113ef7fc..fcb30130730 100644
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@ -306,7 +306,7 @@ class INFO_MT_help(Menu):
 
         layout.operator(
                 "wm.url_open", text="Manual", icon='HELP',
-                ).url = "https://www.blender.org/manual"
+                ).url = "https://docs.blender.org/manual/en/dev/"
         layout.operator(
                 "wm.url_open", text="Release Log", icon='URL',
                 ).url = "http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/%d.%d" % bpy.app.version[:2]
diff --git a/release/scripts/templates_py/addon_add_object.py b/release/scripts/templates_py/addon_add_object.py
index d294838d3a2..56e6e79b94f 100644
--- a/release/scripts/templates_py/addon_add_object.py
+++ b/release/scripts/templates_py/addon_add_object.py
@@ -69,7 +69,7 @@ def add_object_button(self, context):
 
 # This allows you to right click on a button and link to the manual
 def add_object_manual_map():
-    url_manual_prefix = "https://www.blender.org/manual/"
+    url_manual_prefix = "https://docs.blender.org/manual/en/dev/"
     url_manual_mapping = (
         ("bpy.ops.mesh.add_object", "editors/3dview/object"),
         )
diff --git a/release/text/readme.html b/release/text/readme.html
index 8e08a8ba027..45bff37b025 100644
--- a/release/text/readme.html
+++ b/release/text/readme.html
@@ -104,7 +104,7 @@ Full release log <a href="http://wiki.blender.org/index.php/Dev:Ref/Release_Note
 <span class="s4">wiki.blender.org/index.php/Dev:Ref/Release_Notes/BLENDER_VERSION</span></a><br>
 Tutorials <a href="http://www.blender.org/support/tutorials/">
 <span class="s4">www.blender.org/support/tutorials/</span></a> <br>
-Manual <a href="http://www.blender.org/manual"><span class="s4">www.blender.org/manual</span></a><br>
+Manual <a href="https://docs.blender.org/manual/en/dev/"><span class="s4">https://docs.blender.org/manual/en/dev/</span></a><br>
 User Forum <a href="http://www.blenderartists.org/">
 <span class="s4">www.blenderartists.org</span></a><br>
 IRC <a href="irc://irc.freenode.net/#blenderchat">
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index 059f7309cf5..784c76bffd3 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -145,10 +145,6 @@ typedef DMDrawOption (*DMSetDrawOptions)(void *userData, int index);
 typedef DMDrawOption (*DMSetDrawOptionsMappedTex)(void *userData, int origindex, int mat_nr);
 typedef DMDrawOption (*DMSetDrawOptionsTex)(struct MTexPoly *mtexpoly, const bool has_vcol, int matnr);
 
-/* Cleanup callback type */
-typedef void (*DMCleanupBatchCache)(void *batchCache);
-void DM_set_batch_cleanup_callback(DMCleanupBatchCache);
-
 typedef enum DMDrawFlag {
 	DM_DRAW_USE_COLORS          = (1 << 0),
 	DM_DRAW_ALWAYS_SMOOTH       = (1 << 1),
@@ -176,6 +172,8 @@ typedef enum DMDirtyFlag {
 
 	/* check this with modifier dependsOnNormals callback to see if normals need recalculation */
 	DM_DIRTY_NORMALS = 1 << 2,
+
+	DM_MESH_BATCH_CACHE = 1 << 3,
 }  DMDirtyFlag;
 
 typedef struct DerivedMesh DerivedMesh;
@@ -187,7 +185,6 @@ struct DerivedMesh {
 	int deformedOnly; /* set by modifier stack if only deformed from original */
 	BVHCache *bvhCache;
 	struct GPUDrawObject *drawObject;
-	void *batchCache;
 	DerivedMeshType type;
 	float auto_bump_scale;
 	DMDirtyFlag dirty;
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index 78d6f6c7cb9..c2323100205 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -97,7 +97,6 @@ void BKE_armature_where_is(struct bArmature *arm);
 void BKE_armature_where_is_bone(struct Bone *bone, struct Bone *prevbone, const bool use_recursion);
 void BKE_pose_clear_pointers(struct bPose *pose);
 void BKE_pose_rebuild(struct Object *ob, struct bArmature *arm);
-void BKE_pose_rebuild_ex(struct Object *ob, struct bArmature *arm, const bool sort_bones);
 void BKE_pose_where_is(struct Scene *scene, struct Object *ob);
 void BKE_pose_where_is_bone(struct Scene *scene, struct Object *ob, struct bPoseChannel *pchan, float ctime, bool do_extra);
 void BKE_pose_where_is_bone_tail(struct bPoseChannel *pchan);
diff --git a/source/blender/blenkernel/BKE_mesh_render.h b/source/blender/blenkernel/BKE_mesh_render.h
new file mode 100644
index 00000000000..8a2b3f9d9ec
--- /dev/null
+++ b/source/blender/blenkernel/BKE_mesh_render.h
@@ -0,0 +1,42 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2017 by Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation, Mike Erwin, Dalai Felinto
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#ifndef __BKE_MESH_RENDER_H__
+#define __BKE_MESH_RENDER_H__
+
+/** \file BKE_mesh_render.h
+ *  \ingroup bke
+ */
+
+struct Batch;
+struct Mesh;
+
+void BKE_mesh_batch_cache_free(struct Mesh *me);
+struct Batch *BKE_mesh_batch_cache_get_all_edges(struct Mesh *me);
+struct Batch *BKE_mesh_batch_cache_get_all_triangles(struct Mesh *me);
+struct Batch *BKE_mesh_batch_cache_get_all_verts(struct Mesh *me);
+struct Batch *BKE_mesh_batch_cache_get_fancy_edges(struct Mesh *me);
+struct Batch *BKE_mesh_batch_cache_get_overlay_edges(struct Mesh *me);
+
+#endif /* __BKE_MESH_RENDER_H__ */
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index f6c08909d23..92b186d7329 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -260,20 +260,11 @@ typedef struct ModifierTypeInfo {
 	 */
 	bool (*isDisabled)(struct ModifierData *md, int userRenderParams);
 
-	/* Add the appropriate relations to the DEP graph depending on the
-	 * modifier data. 
-	 *
-	 * This function is optional.
-	 */
-	void (*updateDepgraph)(struct ModifierData *md, struct DagForest *forest,
-	                       struct Main *bmain, struct Scene *scene,
-	                       struct Object *ob, struct DagNode *obNode);
-
 	/* Add the appropriate relations to the dependency graph.
 	 *
 	 * This function is optional.
 	 */
-	/* TODO(sergey): Remove once we finalyl switched to the new depsgraph. */
+	/* TODO(sergey): Remove once we finally switched to the new depsgraph. */
 	void (*updateDepsgraph)(struct ModifierData *md,
 	                        struct Main *bmain,
 	                        struct Scene *scene,
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index fcdaa33acfc..6202c84f320 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -134,6 +134,7 @@ set(SRC
 	intern/mesh_evaluate.c
 	intern/mesh_mapping.c
 	intern/mesh_remap.c
+	intern/mesh_render.c
 	intern/mesh_validate.c
 	intern/modifier.c
 	intern/modifiers_bmesh.c
@@ -260,6 +261,7 @@ set(SRC
 	BKE_mesh.h
 	BKE_mesh_mapping.h
 	BKE_mesh_remap.h
+	BKE_mesh_render.h
 	BKE_modifier.h
 	BKE_movieclip.h
 	BKE_multires.h
@@ -539,8 +541,4 @@ endif()
 #	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
 #endif()
 
-if(WITH_LEGACY_DEPSGRAPH)
-	add_definitions(-DWITH_LEGACY_DEPSGRAPH)
-endif()
-
 blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index fb0087aefac..e0bbe345fc4 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -260,12 +260,6 @@ static CustomData *dm_getPolyCData(DerivedMesh *dm)
 	return &dm->polyData;
 }
 
-static DMCleanupBatchCache cleanupBatchCache = NULL;
-void DM_set_batch_cleanup_callback(DMCleanupBatchCache func)
-{
-	cleanupBatchCache = func;
-}
-
 /**
  * Utility function to initialize a DerivedMesh's function pointers to
  * the default implementation (for those functions which have a default)
@@ -324,8 +318,6 @@ void DM_init(
 
 	DM_init_funcs(dm);
 
-	dm->batchCache = NULL; /* necessary? dm->drawObject is not set to NULL yet it works fine */
-
 	dm->needsFree = 1;
 	dm->auto_bump_scale = -1.0f;
 	dm->dirty = 0;
@@ -385,10 +377,7 @@ int DM_release(DerivedMesh *dm)
 	if (dm->needsFree) {
 		bvhcache_free(&dm->bvhCache);
 		GPU_drawobject_free(dm);
-		if (dm->batchCache && cleanupBatchCache) {
-			cleanupBatchCache(dm->batchCache);
-			dm->batchCache = NULL;
-		}
+
 		CustomData_free(&dm->vertData, dm->numVertData);
 		CustomData_free(&dm->edgeData, dm->numEdgeData);
 		CustomData_free(&dm->faceData, dm->numTessFaceData);
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 0287d6ae9ca..89e93a6384d 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1918,7 +1918,7 @@ void BKE_pose_clear_pointers(bPose *pose)
 
 /* only after leave editmode, duplicating, validating older files, library syncing */
 /* NOTE: pose->flag is set for it */
-void BKE_pose_rebuild_ex(Object *ob, bArmature *arm, const bool sort_bones)
+void BKE_pose_rebuild(Object *ob, bArmature *arm)
 {
 	Bone *bone;
 	bPose *pose;
@@ -1962,25 +1962,12 @@ void BKE_pose_rebuild_ex(Object *ob, bArmature *arm, const bool sort_bones)
 
 	BKE_pose_update_constraint_flags(ob->pose); /* for IK detection for example */
 
-#ifdef WITH_LEGACY_DEPSGRAPH
-	/* the sorting */
-	/* Sorting for new dependnecy graph is done on the scene graph level. */
-	if (counter > 1 && sort_bones) {
-		DAG_pose_sort(ob);
-	}
-#endif
-
 	ob->pose->flag &= ~POSE_RECALC;
 	ob->pose->flag |= POSE_WAS_REBUILT;
 
 	BKE_pose_channels_hash_make(ob->pose);
 }
 
-void BKE_pose_rebuild(Object *ob, bArmature *arm)
-{
-	BKE_pose_rebuild_ex(ob, arm, true);
-}
-
 /* ********************** THE POSE SOLVER ******************* */
 
 /* loc/rot/size to given mat4 */
diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c
index 3bc81a69c86..a8ab1e9357b 100644
--- a/source/blender/blenkernel/intern/armature_update.c
+++ b/source/blender/blenkernel/intern/armature_update.c
@@ -53,11 +53,7 @@
 
 #include "DEG_depsgraph.h"
 
-#ifdef WITH_LEGACY_DEPSGRAPH
-#  define DEBUG_PRINT if (!DEG_depsgraph_use_legacy() && G.debug & G_DEBUG_DEPSGRAPH) printf
-#else
-#  define DEBUG_PRINT if (G.debug & G_DEBUG_DEPSGRAPH) printf
-#endif
+#define DEBUG_PRINT if (G.debug & G_DEBUG_DEPSGRAPH) printf
 
 /* ********************** SPLINE IK SOLVER ******************* */
 
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index a8341939692..c5b8a18fd65 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -40,56 +40,12 @@
 #endif
 
 #include "BLI_utildefines.h"
-#include "BLI_listbase.h"
-#include "BLI_ghash.h"
-#include "BLI_threads.h"
 
-#include "DNA_anim_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_cachefile_types.h"
-#include "DNA_group_types.h"
-#include "DNA_lamp_types.h"
-#include "DNA_lattice_types.h"
-#include "DNA_key_types.h"
-#include "DNA_material_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_node_types.h"
+#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_windowmanager_types.h"
-#include "DNA_movieclip_types.h"
-#include "DNA_mask_types.h"
-#include "DNA_modifier_types.h"
-#include "DNA_rigidbody_types.h"
 
-#include "BKE_anim.h"
-#include "BKE_animsys.h"
-#include "BKE_action.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_collision.h"
-#include "BKE_effect.h"
-#include "BKE_fcurve.h"
 #include "BKE_global.h"
-#include "BKE_idcode.h"
-#include "BKE_image.h"
-#include "BKE_key.h"
-#include "BKE_library.h"
 #include "BKE_main.h"
-#include "BKE_node.h"
-#include "BKE_material.h"
-#include "BKE_mball.h"
-#include "BKE_modifier.h"
-#include "BKE_object.h"
-#include "BKE_paint.h"
-#include "BKE_particle.h"
-#include "BKE_pointcache.h"
-#include "BKE_scene.h"
-#include "BKE_screen.h"
-#include "BKE_tracking.h"
-
-#include "GPU_buffers.h"
-
-#include "atomic_ops.h"
 
 #include "depsgraph_private.h"
 
@@ -98,3310 +54,6 @@
 #include "DEG_depsgraph_debug.h"
 #include "DEG_depsgraph_query.h"
 
-#ifdef WITH_LEGACY_DEPSGRAPH
-
-static SpinLock threaded_update_lock;
-
-void DAG_init(void)
-{
-	BLI_spin_init(&threaded_update_lock);
-	DEG_register_node_types();
-}
-
-void DAG_exit(void)
-{
-	BLI_spin_end(&threaded_update_lock);
-	DEG_free_node_types();
-}
-
-/* Queue and stack operations for dag traversal 
- *
- * the queue store a list of freenodes to avoid successive alloc/dealloc
- */
-
-DagNodeQueue *queue_create(int slots)
-{
-	DagNodeQueue *queue;
-	DagNodeQueueElem *elem;
-	int i;
-	
-	queue = MEM_mallocN(sizeof(DagNodeQueue), "DAG queue");
-	queue->freenodes = MEM_mallocN(sizeof(DagNodeQueue), "DAG queue");
-	queue->count = 0;
-	queue->maxlevel = 0;
-	queue->first = queue->last = NULL;
-	elem = MEM_mallocN(sizeof(DagNodeQueueElem), "DAG queue elem3");
-	elem->node = NULL;
-	elem->next = NULL;
-	queue->freenodes->first = queue->freenodes->last = elem;
-	
-	for (i = 1; i < slots; i++) {
-		elem = MEM_mallocN(sizeof(DagNodeQueueElem), "DAG queue elem4");
-		elem->node = NULL;
-		elem->next = NULL;
-		queue->freenodes->last->next = elem;
-		queue->freenodes->last = elem;
-	}
-	queue->freenodes->count = slots;
-	return queue;
-}
-
-void queue_raz(DagNodeQueue *queue)
-{
-	DagNodeQueueElem *elem;
-	
-	elem = queue->first;
-	if (queue->freenodes->last)
-		queue->freenodes->last->next = elem;
-	else
-		queue->freenodes->first = queue->freenodes->last = elem;
-	
-	elem->node = NULL;
-	queue->freenodes->count++;
-	while (elem->next) {
-		elem = elem->next;
-		elem->node = NULL;
-		queue->freenodes->count++;
-	}
-	queue->freenodes->last = elem;
-	queue->count = 0;
-}
-
-void queue_delete(DagNodeQueue *queue)
-{
-	DagNodeQueueElem *elem;
-	DagNodeQueueElem *temp;
-	
-	elem = queue->first;
-	while (elem) {
-		temp = elem;
-		elem = elem->next;
-		MEM_freeN(temp);
-	}
-	
-	elem = queue->freenodes->first;
-	while (elem) {
-		temp = elem;
-		elem = elem->next;
-		MEM_freeN(temp);
-	}
-	
-	MEM_freeN(queue->freenodes);
-	MEM_freeN(queue);
-}
-
-/* insert in queue, remove in front */
-void push_queue(DagNodeQueue *queue, DagNode *node)
-{
-	DagNodeQueueElem *elem;
-	int i;
-
-	if (node == NULL) {
-		fprintf(stderr, "pushing null node\n");
-		return;
-	}
-	/*fprintf(stderr, "BFS push : %s %d\n", ((ID *) node->ob)->name, queue->count);*/
-
-	elem = queue->freenodes->first;
-	if (elem != NULL) {
-		queue->freenodes->first = elem->next;
-		if (queue->freenodes->last == elem) {
-			queue->freenodes->last = NULL;
-			queue->freenodes->first = NULL;
-		}
-		queue->freenodes->count--;
-	}
-	else { /* alllocating more */
-		elem = MEM_mallocN(sizeof(DagNodeQueueElem), "DAG queue elem1");
-		elem->node = NULL;
-		elem->next = NULL;
-		queue->freenodes->first = queue->freenodes->last = elem;
-
-		for (i = 1; i < DAGQUEUEALLOC; i++) {
-			elem = MEM_mallocN(sizeof(DagNodeQueueElem), "DAG queue elem2");
-			elem->node = NULL;
-			elem->next = NULL;
-			queue->freenodes->last->next = elem;
-			queue->freenodes->last = elem;
-		}
-		queue->freenodes->count = DAGQUEUEALLOC;
-			
-		elem = queue->freenodes->first;
-		queue->freenodes->first = elem->next;
-	}
-	elem->next = NULL;
-	elem->node = node;
-	if (queue->last != NULL)
-		queue->last->next = elem;
-	queue->last = elem;
-	if (queue->first == NULL) {
-		queue->first = elem;
-	}
-	queue->count++;
-}
-
-
-/* insert in front, remove in front */
-void push_stack(DagNodeQueue *queue, DagNode *node)
-{
-	DagNodeQueueElem *elem;
-	int i;
-
-	elem = queue->freenodes->first;
-	if (elem != NULL) {
-		queue->freenodes->first = elem->next;
-		if (queue->freenodes->last == elem) {
-			queue->freenodes->last = NULL;
-			queue->freenodes->first = NULL;
-		}
-		queue->freenodes->count--;
-	}
-	else { /* alllocating more */
-		elem = MEM_mallocN(sizeof(DagNodeQueueElem), "DAG queue elem1");
-		elem->node = NULL;
-		elem->next = NULL;
-		queue->freenodes->first = queue->freenodes->last = elem;
-
-		for (i = 1; i < DAGQUEUEALLOC; i++) {
-			elem = MEM_mallocN(sizeof(DagNodeQueueElem), "DAG queue elem2");
-			elem->node = NULL;
-			elem->next = NULL;
-			queue->freenodes->last->next = elem;
-			queue->freenodes->last = elem;
-		}
-		queue->freenodes->count = DAGQUEUEALLOC;
-			
-		elem = queue->freenodes->first;
-		queue->freenodes->first = elem->next;
-	}
-	elem->next = queue->first;
-	elem->node = node;
-	queue->first = elem;
-	if (queue->last == NULL)
-		queue->last = elem;
-	queue->count++;
-}
-
-
-DagNode *pop_queue(DagNodeQueue *queue)
-{
-	DagNodeQueueElem *elem;
-	DagNode *node;
-
-	elem = queue->first;
-	if (elem) {
-		queue->first = elem->next;
-		if (queue->last == elem) {
-			queue->last = NULL;
-			queue->first = NULL;
-		}
-		queue->count--;
-		if (queue->freenodes->last)
-			queue->freenodes->last->next = elem;
-		queue->freenodes->last = elem;
-		if (queue->freenodes->first == NULL)
-			queue->freenodes->first = elem;
-		node = elem->node;
-		elem->node = NULL;
-		elem->next = NULL;
-		queue->freenodes->count++;
-		return node;
-	}
-	else {
-		fprintf(stderr, "return null\n");
-		return NULL;
-	}
-}
-
-DagNode *get_top_node_queue(DagNodeQueue *queue)
-{
-	return queue->first->node;
-}
-
-DagForest *dag_init(void)
-{
-	DagForest *forest;
-	/* use callocN to init all zero */
-	forest = MEM_callocN(sizeof(DagForest), "DAG root");
-	forest->ugly_hack_sorry = true;
-	return forest;
-}
-
-/* isdata = object data... */
-/* XXX this needs to be extended to be more flexible (so that not only objects are evaluated via depsgraph)... */
-static void dag_add_driver_relation(AnimData *adt, DagForest *dag, DagNode *node, int isdata)
-{
-	FCurve *fcu;
-	DagNode *node1;
-	
-	for (fcu = adt->drivers.first; fcu; fcu = fcu->next) {
-		ChannelDriver *driver = fcu->driver;
-		DriverVar *dvar;
-		int isdata_fcu = (isdata) || (fcu->rna_path && strstr(fcu->rna_path, "modifiers["));
-		
-		/* loop over variables to get the target relationships */
-		for (dvar = driver->variables.first; dvar; dvar = dvar->next) {
-			/* only used targets */
-			DRIVER_TARGETS_USED_LOOPER(dvar) 
-			{
-				if (dtar->id) {
-					/* FIXME: other data types need to be added here so that they can work! */
-					if (GS(dtar->id->name) == ID_OB) {
-						Object *ob = (Object *)dtar->id;
-						
-						/* normal channel-drives-channel */
-						node1 = dag_get_node(dag, dtar->id);
-						
-						/* check if bone... */
-						if ((ob->type == OB_ARMATURE) &&
-						    ( ((dtar->rna_path) && strstr(dtar->rna_path, "pose.bones[")) ||
-						      ((dtar->flag & DTAR_FLAG_STRUCT_REF) && (dtar->pchan_name[0])) ))
-						{
-							dag_add_relation(dag, node1, node, isdata_fcu ? DAG_RL_DATA_DATA : DAG_RL_DATA_OB, "Driver");
-						}
-						/* check if ob data */
-						else if (dtar->rna_path && strstr(dtar->rna_path, "data."))
-							dag_add_relation(dag, node1, node, isdata_fcu ? DAG_RL_DATA_DATA : DAG_RL_DATA_OB, "Driver");
-						/* normal */
-						else
-							dag_add_relation(dag, node1, node, isdata_fcu ? DAG_RL_OB_DATA : DAG_RL_OB_OB, "Driver");
-					}
-				}
-			}
-			DRIVER_TARGETS_LOOPER_END
-		}
-	}
-}
-
-/* XXX: forward def for material driver handling... */
-static void dag_add_material_driver_relations(DagForest *dag, DagNode *node, Material *ma);
-
-/* recursive handling for shader nodetree drivers */
-static void dag_add_shader_nodetree_driver_relations(DagForest *dag, DagNode *node, bNodeTree *ntree)
-{
-	bNode *n;
-
-	/* nodetree itself */
-	if (ntree->adt) {
-		dag_add_driver_relation(ntree->adt, dag, node, 1);
-	}
-	
-	/* nodetree's nodes... */
-	for (n = ntree->nodes.first; n; n = n->next) {
-		if (n->id) {
-			if (GS(n->id->name) == ID_MA) {
-				dag_add_material_driver_relations(dag, node, (Material *)n->id);
-			}
-			else if (n->type == NODE_GROUP) {
-				dag_add_shader_nodetree_driver_relations(dag, node, (bNodeTree *)n->id);
-			}
-		}
-	}
-}
-
-/* recursive handling for material drivers */
-static void dag_add_material_driver_relations(DagForest *dag, DagNode *node, Material *ma)
-{
-	/* Prevent infinite recursion by checking (and tagging the material) as having been visited 
-	 * already (see build_dag()). This assumes ma->id.tag & LIB_TAG_DOIT isn't set by anything else
-	 * in the meantime... [#32017]
-	 */
-	if (ma->id.tag & LIB_TAG_DOIT)
-		return;
-
-	ma->id.tag |= LIB_TAG_DOIT;
-	
-	/* material itself */
-	if (ma->adt)
-		dag_add_driver_relation(ma->adt, dag, node, 1);
-
-	/* textures */
-	// TODO...
-	//dag_add_texture_driver_relations(DagForest *dag, DagNode *node, ID *id);
-
-	/* material's nodetree */
-	if (ma->nodetree)
-		dag_add_shader_nodetree_driver_relations(dag, node, ma->nodetree);
-
-	ma->id.tag &= ~LIB_TAG_DOIT;
-}
-
-/* recursive handling for lamp drivers */
-static void dag_add_lamp_driver_relations(DagForest *dag, DagNode *node, Lamp *la)
-{
-	/* Prevent infinite recursion by checking (and tagging the lamp) as having been visited 
-	 * already (see build_dag()). This assumes la->id.tag & LIB_TAG_DOIT isn't set by anything else
-	 * in the meantime... [#32017]
-	 */
-	if (la->id.tag & LIB_TAG_DOIT)
-		return;
-
-	la->id.tag |= LIB_TAG_DOIT;
-	
-	/* lamp itself */
-	if (la->adt)
-		dag_add_driver_relation(la->adt, dag, node, 1);
-
-	/* textures */
-	// TODO...
-	//dag_add_texture_driver_relations(DagForest *dag, DagNode *node, ID *id);
-
-	/* lamp's nodetree */
-	if (la->nodetree)
-		dag_add_shader_nodetree_driver_relations(dag, node, la->nodetree);
-
-	la->id.tag &= ~LIB_TAG_DOIT;
-}
-
-static void create_collision_relation(DagForest *dag, DagNode *node, Object *ob1, const char *name)
-{
-	DagNode *node2 = dag_get_node(dag, ob1);
-	dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, name);
-}
-
-void dag_add_collision_relations(DagForest *dag, Scene *scene, Object *ob, DagNode *node, Group *group, int layer, unsigned int modifier_type, DagCollobjFilterFunction fn, bool dupli, const char *name)
-{
-	unsigned int numcollobj;
-	Object **collobjs = get_collisionobjects_ext(scene, ob, group, layer, &numcollobj, modifier_type, dupli);
-
-	for (unsigned int i = 0; i < numcollobj; i++) {
-		Object *ob1 = collobjs[i];
-
-		if (!fn || fn(ob1, modifiers_findByType(ob1, modifier_type))) {
-			create_collision_relation(dag, node, ob1, name);
-		}
-	}
-
-	if (collobjs)
-		MEM_freeN(collobjs);
-}
-
-void dag_add_forcefield_relations(DagForest *dag, Scene *scene, Object *ob, DagNode *node, EffectorWeights *effector_weights, bool add_absorption, int skip_forcefield, const char *name)
-{
-	ListBase *effectors = pdInitEffectors(scene, ob, NULL, effector_weights, false);
-
-	if (effectors) {
-		for (EffectorCache *eff = effectors->first; eff; eff = eff->next) {
-			if (eff->ob != ob && eff->pd->forcefield != skip_forcefield) {
-				create_collision_relation(dag, node, eff->ob, name);
-
-				if (eff->pd->forcefield == PFIELD_SMOKEFLOW && eff->pd->f_source) {
-					create_collision_relation(dag, node, eff->pd->f_source, "Smoke Force Domain");
-				}
-
-				if (add_absorption && (eff->pd->flag & PFIELD_VISIBILITY)) {
-					/* Actual code uses get_collider_cache */
-					dag_add_collision_relations(dag, scene, ob, node, NULL, eff->ob->lay, eModifierType_Collision, NULL, true, "Force Absorption");
-				}
-			}
-		}
-	}
-
-	pdEndEffectors(&effectors);
-}
-
-static void build_dag_object(DagForest *dag, DagNode *scenenode, Main *bmain, Scene *scene, Object *ob, int mask)
-{
-	bConstraint *con;
-	DagNode *node;
-	DagNode *node2;
-	DagNode *node3;
-	Key *key;
-	ParticleSystem *psys;
-	int addtoroot = 1;
-	
-	node = dag_get_node(dag, ob);
-	
-	if ((ob->data) && (mask & DAG_RL_DATA)) {
-		node2 = dag_get_node(dag, ob->data);
-		dag_add_relation(dag, node, node2, DAG_RL_DATA, "Object-Data Relation");
-		node2->first_ancestor = ob;
-		node2->ancestor_count += 1;
-	}
-
-	/* also build a custom data mask for dependencies that need certain layers */
-	
-	if (ob->type == OB_ARMATURE) {
-		if (ob->pose) {
-			bPoseChannel *pchan;
-			
-			for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
-				for (con = pchan->constraints.first; con; con = con->next) {
-					const bConstraintTypeInfo *cti = BKE_constraint_typeinfo_get(con);
-					ListBase targets = {NULL, NULL};
-					bConstraintTarget *ct;
-					
-					if (cti && cti->get_constraint_targets) {
-						cti->get_constraint_targets(con, &targets);
-						
-						for (ct = targets.first; ct; ct = ct->next) {
-							if (ct->tar && ct->tar != ob) {
-								// fprintf(stderr, "armature %s target :%s\n", ob->id.name, target->id.name);
-								node3 = dag_get_node(dag, ct->tar);
-								
-								if (ct->subtarget[0]) {
-									dag_add_relation(dag, node3, node, DAG_RL_OB_DATA | DAG_RL_DATA_DATA, cti->name);
-									if (ct->tar->type == OB_MESH)
-										node3->customdata_mask |= CD_MASK_MDEFORMVERT;
-								}
-								else if (ELEM(con->type, CONSTRAINT_TYPE_FOLLOWPATH, CONSTRAINT_TYPE_CLAMPTO, CONSTRAINT_TYPE_SPLINEIK))
-									dag_add_relation(dag, node3, node, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, cti->name);
-								else
-									dag_add_relation(dag, node3, node, DAG_RL_OB_DATA, cti->name);
-							}
-						}
-						
-						if (cti->flush_constraint_targets)
-							cti->flush_constraint_targets(con, &targets, 1);
-					}
-					
-				}
-			}
-		}
-	}
-	
-	/* driver dependencies, nla modifiers */
-#if 0 // XXX old animation system
-	if (ob->nlastrips.first) {
-		bActionStrip *strip;
-		bActionChannel *chan;
-		for (strip = ob->nlastrips.first; strip; strip = strip->next) {
-			if (strip->modifiers.first) {
-				bActionModifier *amod;
-				for (amod = strip->modifiers.first; amod; amod = amod->next) {
-					if (amod->ob) {
-						node2 = dag_get_node(dag, amod->ob);
-						dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "NLA Strip Modifier");
-					}
-				}
-			}
-		}
-	}
-#endif // XXX old animation system
-	if (ob->adt)
-		dag_add_driver_relation(ob->adt, dag, node, (ob->type == OB_ARMATURE));  // XXX isdata arg here doesn't give an accurate picture of situation
-		
-	key = BKE_key_from_object(ob);
-	if (key && key->adt)
-		dag_add_driver_relation(key->adt, dag, node, 1);
-
-	if (ob->modifiers.first) {
-		ModifierData *md;
-		
-		for (md = ob->modifiers.first; md; md = md->next) {
-			const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
-			
-			if (mti->updateDepgraph) mti->updateDepgraph(md, dag, bmain, scene, ob, node);
-		}
-	}
-	if (ob->parent) {
-		node2 = dag_get_node(dag, ob->parent);
-		
-		switch (ob->partype) {
-			case PARSKEL:
-				dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA | DAG_RL_OB_OB, "Parent");
-				break;
-			case PARVERT1: case PARVERT3:
-				dag_add_relation(dag, node2, node, DAG_RL_DATA_OB | DAG_RL_OB_OB, "Vertex Parent");
-				node2->customdata_mask |= CD_MASK_ORIGINDEX;
-				break;
-			case PARBONE:
-				dag_add_relation(dag, node2, node, DAG_RL_DATA_OB | DAG_RL_OB_OB, "Bone Parent");
-				break;
-			default:
-				if (ob->parent->type == OB_LATTICE)
-					dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA | DAG_RL_OB_OB, "Lattice Parent");
-				else if (ob->parent->type == OB_CURVE) {
-					Curve *cu = ob->parent->data;
-					if (cu->flag & CU_PATH) 
-						dag_add_relation(dag, node2, node, DAG_RL_DATA_OB | DAG_RL_OB_OB, "Curve Parent");
-					else
-						dag_add_relation(dag, node2, node, DAG_RL_OB_OB, "Curve Parent");
-				}
-				else
-					dag_add_relation(dag, node2, node, DAG_RL_OB_OB, "Parent");
-				break;
-		}
-		/* exception case: parent is duplivert */
-		if (ob->type == OB_MBALL && (ob->parent->transflag & OB_DUPLIVERTS)) {
-			dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA | DAG_RL_OB_OB, "Duplivert");
-		}
-		
-		addtoroot = 0;
-	}
-	if (ob->proxy) {
-		node2 = dag_get_node(dag, ob->proxy);
-		dag_add_relation(dag, node, node2, DAG_RL_DATA_DATA | DAG_RL_OB_OB, "Proxy");
-		/* inverted relation, so addtoroot shouldn't be set to zero */
-	}
-	
-	if (ob->transflag & OB_DUPLI) {
-		if ((ob->transflag & OB_DUPLIGROUP) && ob->dup_group) {
-			GroupObject *go;
-			for (go = ob->dup_group->gobject.first; go; go = go->next) {
-				if (go->ob) {
-					node2 = dag_get_node(dag, go->ob);
-					/* node2 changes node1, this keeps animations updated in groups?? not logical? */
-					dag_add_relation(dag, node2, node, DAG_RL_OB_OB, "Dupligroup");
-				}
-			}
-		}
-	}
-
-	/* rigidbody force fields  */
-	if ((ob->type == OB_MESH) || (ob->type == OB_CURVE) || (ob->type == OB_LATTICE)) {
-		if (ob->rigidbody_object && scene->rigidbody_world) {
-			dag_add_forcefield_relations(dag, scene, ob, node, scene->rigidbody_world->effector_weights, true, 0, "Force Field");
-		}
-	}
-
-	/* object data drivers */
-	if (ob->data) {
-		AnimData *adt = BKE_animdata_from_id((ID *)ob->data);
-		if (adt)
-			dag_add_driver_relation(adt, dag, node, 1);
-	}
-	
-	/* object type/data relationships */
-	switch (ob->type) {
-		case OB_CAMERA:
-		{
-			Camera *cam = (Camera *)ob->data;
-			
-			if (cam->dof_ob) {
-				node2 = dag_get_node(dag, cam->dof_ob);
-				dag_add_relation(dag, node2, node, DAG_RL_OB_OB, "Camera DoF");
-			}
-			break;
-		}
-		case OB_MBALL: 
-		{
-			Object *mom = BKE_mball_basis_find(scene, ob);
-			
-			if (mom != ob) {
-				node2 = dag_get_node(dag, mom);
-				dag_add_relation(dag, node, node2, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Metaball");  /* mom depends on children! */
-			}
-			break;
-		}
-		case OB_CURVE:
-		case OB_FONT:
-		{
-			Curve *cu = ob->data;
-			
-			if (cu->bevobj) {
-				node2 = dag_get_node(dag, cu->bevobj);
-				dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Curve Bevel");
-			}
-			if (cu->taperobj) {
-				node2 = dag_get_node(dag, cu->taperobj);
-				dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Curve Taper");
-			}
-			if (ob->type == OB_FONT) {
-				/* Really rather dirty hack. needs to support font family to work
-				 * reliably on render export.
-				 *
-				 * This totally mimics behavior of regular verts duplication with
-				 * parenting. The only tricky thing here is to get list of objects
-				 * used for the custom "font".
-				 *
-				 * This shouldn't harm so much because this code only runs on DAG
-				 * rebuild and this feature is not that commonly used.
-				 *
-				 *                                                 - sergey -
-				 */
-				if (cu->family[0] != '\n') {
-					ListBase *duplilist;
-					DupliObject *dob;
-					duplilist = object_duplilist(G.main->eval_ctx, scene, ob);
-					for (dob = duplilist->first; dob; dob = dob->next) {
-						node2 = dag_get_node(dag, dob->ob);
-						dag_add_relation(dag, node, node2, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Object Font");
-					}
-					free_object_duplilist(duplilist);
-				}
-
-				if (cu->textoncurve) {
-					node2 = dag_get_node(dag, cu->textoncurve);
-					/* Text on curve requires path to be evaluated for the target curve. */
-					node2->eval_flags |= DAG_EVAL_NEED_CURVE_PATH;
-					dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Texture On Curve");
-				}
-			}
-			break;
-		}
-	}
-	
-	/* material drivers */
-	if (ob->totcol) {
-		int a;
-		
-		for (a = 1; a <= ob->totcol; a++) {
-			Material *ma = give_current_material(ob, a);
-			
-			if (ma) {
-				/* recursively figure out if there are drivers, and hook these up to this object */
-				dag_add_material_driver_relations(dag, node, ma);
-			}
-		}
-	}
-	else if (ob->type == OB_LAMP) {
-		dag_add_lamp_driver_relations(dag, node, ob->data);
-	}
-	
-	/* particles */
-	psys = ob->particlesystem.first;
-	if (psys) {
-		GroupObject *go;
-
-		for (; psys; psys = psys->next) {
-			BoidRule *rule = NULL;
-			BoidState *state = NULL;
-			ParticleSettings *part = psys->part;
-
-			if (part->adt) {
-				dag_add_driver_relation(part->adt, dag, node, 1);
-			}
-
-			dag_add_relation(dag, node, node, DAG_RL_OB_DATA, "Particle-Object Relation");
-
-			if (!psys_check_enabled(ob, psys, G.is_rendering))
-				continue;
-
-			if (ELEM(part->phystype, PART_PHYS_KEYED, PART_PHYS_BOIDS)) {
-				ParticleTarget *pt = psys->targets.first;
-
-				for (; pt; pt = pt->next) {
-					if (pt->ob && BLI_findlink(&pt->ob->particlesystem, pt->psys - 1)) {
-						node2 = dag_get_node(dag, pt->ob);
-						dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Particle Targets");
-					}
-				}
-			}
-
-			if (part->ren_as == PART_DRAW_OB && part->dup_ob) {
-				node2 = dag_get_node(dag, part->dup_ob);
-				/* note that this relation actually runs in the wrong direction, the problem
-				 * is that dupli system all have this (due to parenting), and the render
-				 * engine instancing assumes particular ordering of objects in list */
-				dag_add_relation(dag, node, node2, DAG_RL_OB_OB, "Particle Object Visualization");
-				if (part->dup_ob->type == OB_MBALL)
-					dag_add_relation(dag, node, node2, DAG_RL_DATA_DATA, "Particle Object Visualization");
-			}
-
-			if (part->ren_as == PART_DRAW_GR && part->dup_group) {
-				for (go = part->dup_group->gobject.first; go; go = go->next) {
-					node2 = dag_get_node(dag, go->ob);
-					dag_add_relation(dag, node2, node, DAG_RL_OB_OB, "Particle Group Visualization");
-				}
-			}
-
-			if (part->type != PART_HAIR) {
-				/* Actual code uses get_collider_cache */
-				dag_add_collision_relations(dag, scene, ob, node, part->collision_group, ob->lay, eModifierType_Collision, NULL, true, "Particle Collision");
-			}
-			else if ((psys->flag & PSYS_HAIR_DYNAMICS) && psys->clmd && psys->clmd->coll_parms) {
-				/* Hair uses cloth simulation, i.e. get_collision_objects */
-				dag_add_collision_relations(dag, scene, ob, node, psys->clmd->coll_parms->group, ob->lay | scene->lay, eModifierType_Collision, NULL, true, "Hair Collision");
-			}
-
-			dag_add_forcefield_relations(dag, scene, ob, node, part->effector_weights, part->type == PART_HAIR, 0, "Particle Force Field");
-
-			if (part->boids) {
-				for (state = part->boids->states.first; state; state = state->next) {
-					for (rule = state->rules.first; rule; rule = rule->next) {
-						Object *ruleob = NULL;
-						if (rule->type == eBoidRuleType_Avoid)
-							ruleob = ((BoidRuleGoalAvoid *)rule)->ob;
-						else if (rule->type == eBoidRuleType_FollowLeader)
-							ruleob = ((BoidRuleFollowLeader *)rule)->ob;
-
-						if (ruleob) {
-							node2 = dag_get_node(dag, ruleob);
-							dag_add_relation(dag, node2, node, DAG_RL_OB_DATA, "Boid Rule");
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	/* object constraints */
-	for (con = ob->constraints.first; con; con = con->next) {
-		const bConstraintTypeInfo *cti = BKE_constraint_typeinfo_get(con);
-		ListBase targets = {NULL, NULL};
-		bConstraintTarget *ct;
-		
-		if (!cti)
-			continue;
-
-		/* special case for camera tracking -- it doesn't use targets to define relations */
-		if (ELEM(cti->type, CONSTRAINT_TYPE_FOLLOWTRACK, CONSTRAINT_TYPE_CAMERASOLVER, CONSTRAINT_TYPE_OBJECTSOLVER)) {
-			int depends_on_camera = 0;
-
-			if (cti->type == CONSTRAINT_TYPE_FOLLOWTRACK) {
-				bFollowTrackConstraint *data = (bFollowTrackConstraint *)con->data;
-
-				if ((data->clip || data->flag & FOLLOWTRACK_ACTIVECLIP) && data->track[0])
-					depends_on_camera = 1;
-
-				if (data->depth_ob) {
-					node2 = dag_get_node(dag, data->depth_ob);
-					dag_add_relation(dag, node2, node, DAG_RL_DATA_OB | DAG_RL_OB_OB, cti->name);
-				}
-			}
-			else if (cti->type == CONSTRAINT_TYPE_OBJECTSOLVER)
-				depends_on_camera = 1;
-
-			if (depends_on_camera && scene->camera) {
-				node2 = dag_get_node(dag, scene->camera);
-				dag_add_relation(dag, node2, node, DAG_RL_DATA_OB | DAG_RL_OB_OB, cti->name);
-			}
-
-			dag_add_relation(dag, scenenode, node, DAG_RL_SCENE, "Scene Relation");
-			addtoroot = 0;
-		}
-		else if (cti->get_constraint_targets) {
-			cti->get_constraint_targets(con, &targets);
-			
-			for (ct = targets.first; ct; ct = ct->next) {
-				Object *obt;
-				
-				if (ct->tar)
-					obt = ct->tar;
-				else
-					continue;
-				
-				node2 = dag_get_node(dag, obt);
-				if (ELEM(con->type, CONSTRAINT_TYPE_FOLLOWPATH, CONSTRAINT_TYPE_CLAMPTO))
-					dag_add_relation(dag, node2, node, DAG_RL_DATA_OB | DAG_RL_OB_OB, cti->name);
-				else {
-					if (ELEM(obt->type, OB_ARMATURE, OB_MESH, OB_LATTICE) && (ct->subtarget[0])) {
-						dag_add_relation(dag, node2, node, DAG_RL_DATA_OB | DAG_RL_OB_OB, cti->name);
-						if (obt->type == OB_MESH)
-							node2->customdata_mask |= CD_MASK_MDEFORMVERT;
-					}
-					else
-						dag_add_relation(dag, node2, node, DAG_RL_OB_OB, cti->name);
-				}
-				addtoroot = 0;
-			}
-			
-			if (cti->flush_constraint_targets)
-				cti->flush_constraint_targets(con, &targets, 1);
-		}
-	}
-
-	if (addtoroot == 1)
-		dag_add_relation(dag, scenenode, node, DAG_RL_SCENE, "Scene Relation");
-}
-
-static void build_dag_group(DagForest *dag, DagNode *scenenode, Main *bmain, Scene *scene, Group *group, short mask)
-{
-	GroupObject *go;
-
-	if (group->id.tag & LIB_TAG_DOIT)
-		return;
-	
-	group->id.tag |= LIB_TAG_DOIT;
-
-	for (go = group->gobject.first; go; go = go->next) {
-		build_dag_object(dag, scenenode, bmain, scene, go->ob, mask);
-		if (go->ob->dup_group)
-			build_dag_group(dag, scenenode, bmain, scene, go->ob->dup_group, mask);
-	}
-}
-
-DagForest *build_dag(Main *bmain, Scene *sce, short mask)
-{
-	Base *base;
-	Object *ob;
-	DagNode *node;
-	DagNode *scenenode;
-	DagForest *dag;
-	DagAdjList *itA;
-
-	dag = sce->theDag;
-	if (dag)
-		free_forest(dag);
-	else {
-		dag = dag_init();
-		sce->theDag = dag;
-	}
-	dag->need_update = false;
-
-	BKE_main_id_tag_idcode(bmain, ID_OB, LIB_TAG_DOIT, false);
-
-	/* clear "LIB_TAG_DOIT" flag from all materials, to prevent infinite recursion problems later [#32017] */
-	BKE_main_id_tag_idcode(bmain, ID_MA, LIB_TAG_DOIT, false);
-	BKE_main_id_tag_idcode(bmain, ID_LA, LIB_TAG_DOIT, false);
-	BKE_main_id_tag_idcode(bmain, ID_GR, LIB_TAG_DOIT, false);
-	
-	/* add base node for scene. scene is always the first node in DAG */
-	scenenode = dag_add_node(dag, sce);
-	
-	/* add current scene objects */
-	for (base = sce->base.first; base; base = base->next) {
-		ob = base->object;
-		ob->id.tag |= LIB_TAG_DOIT;
-		build_dag_object(dag, scenenode, bmain, sce, ob, mask);
-		if (ob->proxy)
-			build_dag_object(dag, scenenode, bmain, sce, ob->proxy, mask);
-		if (ob->dup_group) 
-			build_dag_group(dag, scenenode, bmain, sce, ob->dup_group, mask);
-	}
-
-	/* There might be situations when object from current scene depends on
-	 * objects form other scene AND objects from other scene has own
-	 * dependencies on objects from other scene.
-	 *
-	 * This is really important to include such indirect dependencies in order
-	 * to keep threaded update safe but since we don't really know if object is
-	 * coming from current scene or another scene we do rather stupid tag-based
-	 * check here: all the objects for which build_dag_object() was called are
-	 * getting tagged with LIB_TAG_DOIT. This way if some node has untagged
-	 * object we know it's an object from other scene.
-	 *
-	 * It should be enough to to it once, because if there's longer chain of
-	 * indirect dependencies, all the new nodes will be added to the end of the
-	 * list, meaning we'll keep covering them in this for loop.
-	 */
-	for (node = sce->theDag->DagNode.first; node != NULL; node = node->next) {
-		if (node->type == ID_OB) {
-			ob = node->ob;
-			if ((ob->id.tag & LIB_TAG_DOIT) == 0) {
-				ob->id.tag |= LIB_TAG_DOIT;
-				build_dag_object(dag, scenenode, bmain, sce, ob, mask);
-				if (ob->proxy)
-					build_dag_object(dag, scenenode, bmain, sce, ob->proxy, mask);
-				if (ob->dup_group)
-					build_dag_group(dag, scenenode, bmain, sce, ob->dup_group, mask);
-			}
-		}
-	}
-
-	BKE_main_id_tag_idcode(bmain, ID_GR, LIB_TAG_DOIT, false);
-	
-	/* Now all relations were built, but we need to solve 1 exceptional case;
-	 * When objects have multiple "parents" (for example parent + constraint working on same object)
-	 * the relation type has to be synced. One of the parents can change, and should give same event to child */
-	
-	/* nodes were callocced, so we can use node->color for temporal storage */
-	for (node = sce->theDag->DagNode.first; node; node = node->next) {
-		if (node->type == ID_OB) {
-			for (itA = node->child; itA; itA = itA->next) {
-				if (itA->node->type == ID_OB) {
-					itA->node->color |= itA->type;
-				}
-			}
-
-			/* also flush custom data mask */
-			((Object *)node->ob)->customdata_mask = node->customdata_mask;
-
-			if (node->parent == NULL) {
-				dag_add_relation(dag, scenenode, node, DAG_RL_SCENE, "Scene Relation");
-			}
-		}
-	}
-	/* now set relations equal, so that when only one parent changes, the correct recalcs are found */
-	for (node = sce->theDag->DagNode.first; node; node = node->next) {
-		if (node->type == ID_OB) {
-			for (itA = node->child; itA; itA = itA->next) {
-				if (itA->node->type == ID_OB) {
-					itA->type |= itA->node->color;
-				}
-			}
-		}
-	}
-	
-	/* cycle detection and solving */
-	// solve_cycles(dag);
-	
-	return dag;
-}
-
-
-void free_forest(DagForest *Dag) 
-{  /* remove all nodes and deps */
-	DagNode *tempN;
-	DagAdjList *tempA;
-	DagAdjList *itA;
-	DagNode *itN = Dag->DagNode.first;
-	
-	while (itN) {
-		itA = itN->child;
-		while (itA) {
-			tempA = itA;
-			itA = itA->next;
-			MEM_freeN(tempA);
-		}
-		
-		itA = itN->parent;
-		while (itA) {
-			tempA = itA;
-			itA = itA->next;
-			MEM_freeN(tempA);
-		}
-		
-		tempN = itN;
-		itN = itN->next;
-		MEM_freeN(tempN);
-	}
-
-	BLI_ghash_free(Dag->nodeHash, NULL, NULL);
-	Dag->nodeHash = NULL;
-	Dag->DagNode.first = NULL;
-	Dag->DagNode.last = NULL;
-	Dag->numNodes = 0;
-
-}
-
-DagNode *dag_find_node(DagForest *forest, void *fob)
-{
-	if (forest->nodeHash)
-		return BLI_ghash_lookup(forest->nodeHash, fob);
-
-	return NULL;
-}
-
-static int dag_print_dependencies = 0;  /* debugging */
-
-/* no checking of existence, use dag_find_node first or dag_get_node */
-DagNode *dag_add_node(DagForest *forest, void *fob)
-{
-	DagNode *node;
-		
-	node = MEM_callocN(sizeof(DagNode), "DAG node");
-	if (node) {
-		node->ob = fob;
-		node->color = DAG_WHITE;
-
-		if (forest->ugly_hack_sorry) node->type = GS(((ID *) fob)->name);  /* sorry, done for pose sorting */
-		if (forest->numNodes) {
-			((DagNode *) forest->DagNode.last)->next = node;
-			forest->DagNode.last = node;
-			forest->numNodes++;
-		}
-		else {
-			forest->DagNode.last = node;
-			forest->DagNode.first = node;
-			forest->numNodes = 1;
-		}
-
-		if (!forest->nodeHash)
-			forest->nodeHash = BLI_ghash_ptr_new("dag_add_node gh");
-		BLI_ghash_insert(forest->nodeHash, fob, node);
-	}
-
-	return node;
-}
-
-DagNode *dag_get_node(DagForest *forest, void *fob)
-{
-	DagNode *node;
-	
-	node = dag_find_node(forest, fob);
-	if (!node) 
-		node = dag_add_node(forest, fob);
-	return node;
-}
-
-
-
-DagNode *dag_get_sub_node(DagForest *forest, void *fob)
-{
-	DagNode *node;
-	DagAdjList *mainchild, *prev = NULL;
-	
-	mainchild = ((DagNode *) forest->DagNode.first)->child;
-	/* remove from first node (scene) adj list if present */
-	while (mainchild) {
-		if (mainchild->node == fob) {
-			if (prev) {
-				prev->next = mainchild->next;
-				MEM_freeN(mainchild);
-				break;
-			}
-			else {
-				((DagNode *) forest->DagNode.first)->child = mainchild->next;
-				MEM_freeN(mainchild);
-				break;
-			}
-		}
-		prev = mainchild;
-		mainchild = mainchild->next;
-	}
-	node = dag_find_node(forest, fob);
-	if (!node) 
-		node = dag_add_node(forest, fob);
-	return node;
-}
-
-static void dag_add_parent_relation(DagForest *UNUSED(forest), DagNode *fob1, DagNode *fob2, short rel, const char *name) 
-{
-	DagAdjList *itA = fob2->parent;
-	
-	while (itA) { /* search if relation exist already */
-		if (itA->node == fob1) {
-			itA->type |= rel;
-			itA->count += 1;
-			return;
-		}
-		itA = itA->next;
-	}
-	/* create new relation and insert at head. MALLOC alert! */
-	itA = MEM_mallocN(sizeof(DagAdjList), "DAG adj list");
-	itA->node = fob1;
-	itA->type = rel;
-	itA->count = 1;
-	itA->next = fob2->parent;
-	itA->name = name;
-	fob2->parent = itA;
-}
-
-void dag_add_relation(DagForest *forest, DagNode *fob1, DagNode *fob2, short rel, const char *name) 
-{
-	DagAdjList *itA = fob1->child;
-	
-	/* parent relation is for cycle checking */
-	dag_add_parent_relation(forest, fob1, fob2, rel, name);
-
-	/* TODO(sergey): Find a better place for this. */
-#ifdef WITH_OPENSUBDIV
-	if ((rel & (DAG_RL_DATA_DATA | DAG_RL_DATA_OB)) != 0) {
-		if (fob1->type == ID_OB) {
-			if ((fob1->eval_flags & DAG_EVAL_NEED_CPU) == 0) {
-				Object *ob2 = fob2->ob;
-				if (ob2->recalc & OB_RECALC_ALL) {
-					/* Make sure object has all the data on CPU. */
-					Object *ob1 = fob1->ob;
-					ob1->recalc |= OB_RECALC_DATA;
-				}
-				fob1->eval_flags |= DAG_EVAL_NEED_CPU;
-			}
-		}
-	}
-#endif
-
-	while (itA) { /* search if relation exist already */
-		if (itA->node == fob2) {
-			itA->type |= rel;
-			itA->count += 1;
-			return;
-		}
-		itA = itA->next;
-	}
-	/* create new relation and insert at head. MALLOC alert! */
-	itA = MEM_mallocN(sizeof(DagAdjList), "DAG adj list");
-	itA->node = fob2;
-	itA->type = rel;
-	itA->count = 1;
-	itA->next = fob1->child;
-	itA->name = name;
-	fob1->child = itA;
-}
-
-static const char *dag_node_name(DagForest *dag, DagNode *node)
-{
-	if (node->ob == NULL)
-		return "null";
-	else if (dag->ugly_hack_sorry)
-		return ((ID *)(node->ob))->name + 2;
-	else
-		return ((bPoseChannel *)(node->ob))->name;
-}
-
-static void dag_node_print_dependencies(DagForest *dag, DagNode *node)
-{
-	DagAdjList *itA;
-
-	printf("%s depends on:\n", dag_node_name(dag, node));
-
-	for (itA = node->parent; itA; itA = itA->next)
-		printf("  %s through %s\n", dag_node_name(dag, itA->node), itA->name);
-	printf("\n");
-}
-
-static int dag_node_print_dependency_recurs(DagForest *dag, DagNode *node, DagNode *endnode)
-{
-	DagAdjList *itA;
-
-	if (node->color == DAG_BLACK)
-		return 0;
-
-	node->color = DAG_BLACK;
-
-	if (node == endnode)
-		return 1;
-
-	for (itA = node->parent; itA; itA = itA->next) {
-		if (dag_node_print_dependency_recurs(dag, itA->node, endnode)) {
-			printf("  %s depends on %s through %s.\n", dag_node_name(dag, node), dag_node_name(dag, itA->node), itA->name);
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-static void dag_node_print_dependency_cycle(DagForest *dag, DagNode *startnode, DagNode *endnode, const char *name)
-{
-	DagNode *node;
-
-	for (node = dag->DagNode.first; node; node = node->next)
-		node->color = DAG_WHITE;
-
-	printf("  %s depends on %s through %s.\n", dag_node_name(dag, endnode), dag_node_name(dag, startnode), name);
-	dag_node_print_dependency_recurs(dag, startnode, endnode);
-	printf("\n");
-}
-
-static int dag_node_recurs_level(DagNode *node, int level)
-{
-	DagAdjList *itA;
-	int newlevel;
-
-	node->color = DAG_BLACK; /* done */
-	newlevel = ++level;
-	
-	for (itA = node->parent; itA; itA = itA->next) {
-		if (itA->node->color == DAG_WHITE) {
-			itA->node->ancestor_count = dag_node_recurs_level(itA->node, level);
-			newlevel = MAX2(newlevel, level + itA->node->ancestor_count);
-		}
-		else
-			newlevel = MAX2(newlevel, level + itA->node->ancestor_count);
-	}
-	
-	return newlevel;
-}
-
-static void dag_check_cycle(DagForest *dag)
-{
-	DagNode *node;
-	DagAdjList *itA;
-
-	dag->is_acyclic = true;
-
-	/* debugging print */
-	if (dag_print_dependencies)
-		for (node = dag->DagNode.first; node; node = node->next)
-			dag_node_print_dependencies(dag, node);
-
-	/* tag nodes unchecked */
-	for (node = dag->DagNode.first; node; node = node->next)
-		node->color = DAG_WHITE;
-	
-	for (node = dag->DagNode.first; node; node = node->next) {
-		if (node->color == DAG_WHITE) {
-			node->ancestor_count = dag_node_recurs_level(node, 0);
-		}
-	}
-	
-	/* check relations, and print errors */
-	for (node = dag->DagNode.first; node; node = node->next) {
-		for (itA = node->parent; itA; itA = itA->next) {
-			if (itA->node->ancestor_count > node->ancestor_count) {
-				if (node->ob && itA->node->ob) {
-					dag->is_acyclic = false;
-					printf("Dependency cycle detected:\n");
-					dag_node_print_dependency_cycle(dag, itA->node, node, itA->name);
-				}
-			}
-		}
-	}
-
-	/* parent relations are only needed for cycle checking, so free now */
-	for (node = dag->DagNode.first; node; node = node->next) {
-		while (node->parent) {
-			itA = node->parent->next;
-			MEM_freeN(node->parent);
-			node->parent = itA;
-		}
-	}
-}
-
-/* debug test functions */
-
-void graph_print_queue(DagNodeQueue *nqueue)
-{	
-	DagNodeQueueElem *queueElem;
-	
-	queueElem = nqueue->first;
-	while (queueElem) {
-		fprintf(stderr, "** %s %i %i-%i ", ((ID *) queueElem->node->ob)->name, queueElem->node->color, queueElem->node->DFS_dvtm, queueElem->node->DFS_fntm);
-		queueElem = queueElem->next;
-	}
-	fprintf(stderr, "\n");
-}
-
-void graph_print_queue_dist(DagNodeQueue *nqueue)
-{	
-	DagNodeQueueElem *queueElem;
-	int count;
-	
-	queueElem = nqueue->first;
-	count = 0;
-	while (queueElem) {
-		fprintf(stderr, "** %25s %2.2i-%2.2i ", ((ID *) queueElem->node->ob)->name, queueElem->node->DFS_dvtm, queueElem->node->DFS_fntm);
-		while (count < queueElem->node->DFS_dvtm - 1) { fputc(' ', stderr); count++; }
-		fputc('|', stderr);
-		while (count < queueElem->node->DFS_fntm - 2) { fputc('-', stderr); count++; }
-		fputc('|', stderr);
-		fputc('\n', stderr);
-		count = 0;
-		queueElem = queueElem->next;
-	}
-	fprintf(stderr, "\n");
-}
-
-void graph_print_adj_list(DagForest *dag)
-{
-	DagNode *node;
-	DagAdjList *itA;
-	
-	node = dag->DagNode.first;
-	while (node) {
-		fprintf(stderr, "node : %s col: %i", ((ID *) node->ob)->name, node->color);
-		itA = node->child;
-		while (itA) {
-			fprintf(stderr, "-- %s ", ((ID *) itA->node->ob)->name);
-			
-			itA = itA->next;
-		}
-		fprintf(stderr, "\n");
-		node = node->next;
-	}
-}
-
-/* ************************ API *********************** */
-
-/* mechanism to allow editors to be informed of depsgraph updates,
- * to do their own updates based on changes... */
-static void (*EditorsUpdateIDCb)(Main *bmain, ID *id) = NULL;
-static void (*EditorsUpdateSceneCb)(Main *bmain, Scene *scene, int updated) = NULL;
-static void (*EditorsUpdateScenePreCb)(Main *bmain, Scene *scene, bool time) = NULL;
-
-void DAG_editors_update_cb(void (*id_func)(Main *bmain, ID *id),
-                           void (*scene_func)(Main *bmain, Scene *scene, int updated),
-                           void (*scene_pre_func)(Main *bmain, Scene *scene, bool time))
-{
-	if (DEG_depsgraph_use_legacy()) {
-		EditorsUpdateIDCb = id_func;
-		EditorsUpdateSceneCb = scene_func;
-		EditorsUpdateScenePreCb = scene_pre_func;
-	}
-	else {
-		/* New dependency graph. */
-		DEG_editors_set_update_cb(id_func, scene_func, scene_pre_func);
-	}
-}
-
-void DAG_editors_update_pre(Main *bmain, Scene *scene, bool time)
-{
-	if (DEG_depsgraph_use_legacy()) {
-		if (EditorsUpdateScenePreCb != NULL) {
-			EditorsUpdateScenePreCb(bmain, scene, time);
-		}
-	}
-	else {
-		DEG_editors_update_pre(bmain, scene, time);
-	}
-}
-
-static void dag_editors_id_update(Main *bmain, ID *id)
-{
-	if (EditorsUpdateIDCb)
-		EditorsUpdateIDCb(bmain, id);
-}
-
-static void dag_editors_scene_update(Main *bmain, Scene *scene, int updated)
-{
-	if (EditorsUpdateSceneCb)
-		EditorsUpdateSceneCb(bmain, scene, updated);
-}
-
-/* groups with objects in this scene need to be put in the right order as well */
-static void scene_sort_groups(Main *bmain, Scene *sce)
-{
-	Base *base;
-	Group *group;
-	GroupObject *go;
-	Object *ob;
-	
-	/* test; are group objects all in this scene? */
-	for (ob = bmain->object.first; ob; ob = ob->id.next) {
-		ob->id.tag &= ~LIB_TAG_DOIT;
-	}
-	for (base = sce->base.first; base; base = base->next)
-		base->object->id.tag |= LIB_TAG_DOIT;
-	
-	for (group = bmain->group.first; group; group = group->id.next) {
-		for (go = group->gobject.first; go; go = go->next) {
-			if ((go->ob->id.tag & LIB_TAG_DOIT) == 0)
-				break;
-		}
-		/* this group is entirely in this scene */
-		if (go == NULL) {
-			ListBase listb = {NULL, NULL};
-			
-			for (go = group->gobject.first; go; go = go->next)
-				go->ob->id.newid = (ID *)go;
-			
-			/* in order of sorted bases we reinsert group objects */
-			for (base = sce->base.first; base; base = base->next) {
-				
-				if (base->object->id.newid) {
-					go = (GroupObject *)base->object->id.newid;
-					base->object->id.newid = NULL;
-					BLI_remlink(&group->gobject, go);
-					BLI_addtail(&listb, go);
-				}
-			}
-			/* copy the newly sorted listbase */
-			group->gobject = listb;
-		}
-	}
-
-	/* newid abused for GroupObject, cleanup. */
-	for (ob = bmain->object.first; ob; ob = ob->id.next) {
-		ob->id.newid = NULL;
-	}
-}
-
-static void dag_scene_tag_rebuild(Scene *sce)
-{
-	if (sce->theDag) {
-		sce->theDag->need_update = true;
-	}
-}
-
-/* free the depency graph */
-static void dag_scene_free(Scene *sce)
-{
-	if (sce->theDag) {
-		free_forest(sce->theDag);
-		MEM_freeN(sce->theDag);
-		sce->theDag = NULL;
-	}
-}
-
-/* Check whether object data needs to be evaluated before it
- * might be used by others.
- *
- * Means that mesh object needs to have proper derivedFinal,
- * curves-typed objects are to have proper curve cache.
- *
- * Other objects or objects which are tagged for data update are
- * not considered to be in need of evaluation.
- */
-static bool check_object_needs_evaluation(Object *object)
-{
-	if (object->recalc & OB_RECALC_ALL) {
-		/* Object is tagged for update anyway, no need to re-tag it. */
-		return false;
-	}
-
-	if (object->type == OB_MESH) {
-		return object->derivedFinal == NULL;
-	}
-	else if (ELEM(object->type, OB_CURVE, OB_SURF, OB_FONT, OB_MBALL, OB_LATTICE)) {
-		return object->curve_cache == NULL;
-	}
-
-	return false;
-}
-
-/* Check whether object data is tagged for update. */
-static bool check_object_tagged_for_update(Object *object)
-{
-	if (object->recalc & OB_RECALC_ALL) {
-		return true;
-	}
-
-	if (ELEM(object->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_MBALL, OB_LATTICE)) {
-		ID *data_id = object->data;
-		return (data_id->tag & (LIB_TAG_ID_RECALC_DATA | LIB_TAG_ID_RECALC)) != 0;
-	}
-
-	return false;
-}
-
-/* Flush changes from tagged objects in the scene to their
- * dependencies which are not evaluated yet.
- *
- * This is needed to ensure all the dependencies are met
- * before objects gets handled by object_handle_update(),
- *
- * This is needed when visible layers are changed or changing
- * scene graph layout which involved usage of objects which
- * aren't in the scene or weren't visible yet.
- */
-static void dag_invisible_dependencies_flush(Scene *scene)
-{
-	DagNode *root_node = scene->theDag->DagNode.first, *node;
-	DagNodeQueue *queue;
-
-	for (node = root_node; node != NULL; node = node->next) {
-		node->color = DAG_WHITE;
-	}
-
-	queue = queue_create(DAGQUEUEALLOC);
-
-	for (node = root_node; node != NULL; node = node->next) {
-		if (node->color == DAG_WHITE) {
-			push_stack(queue, node);
-			node->color = DAG_GRAY;
-
-			while (queue->count) {
-				DagNode *current_node = get_top_node_queue(queue);
-				DagAdjList *itA;
-				bool skip = false;
-
-				for (itA = current_node->child; itA; itA = itA->next) {
-					if (itA->node->color == DAG_WHITE) {
-						itA->node->color = DAG_GRAY;
-						push_stack(queue, itA->node);
-						skip = true;
-						break;
-					}
-				}
-
-				if (!skip) {
-					current_node = pop_queue(queue);
-
-					if (current_node->type == ID_OB) {
-						Object *current_object = current_node->ob;
-						if (check_object_needs_evaluation(current_object)) {
-							for (itA = current_node->child; itA; itA = itA->next) {
-								if (itA->node->type == ID_OB) {
-									Object *object = itA->node->ob;
-									if (check_object_tagged_for_update(object)) {
-										current_object->recalc |= OB_RECALC_OB | OB_RECALC_DATA;
-									}
-								}
-							}
-						}
-					}
-					node->color = DAG_BLACK;
-				}
-			}
-		}
-	}
-
-	queue_delete(queue);
-}
-
-static void dag_invisible_dependencies_check_flush(Main *bmain, Scene *scene)
-{
-	if (DAG_id_type_tagged(bmain, ID_OB) ||
-	    DAG_id_type_tagged(bmain, ID_ME) ||  /* Mesh */
-	    DAG_id_type_tagged(bmain, ID_CU) ||  /* Curve */
-	    DAG_id_type_tagged(bmain, ID_MB) ||  /* MetaBall */
-	    DAG_id_type_tagged(bmain, ID_LT))    /* Lattice */
-	{
-		dag_invisible_dependencies_flush(scene);
-	}
-}
-
-/* sort the base list on dependency order */
-static void dag_scene_build(Main *bmain, Scene *sce)
-{
-	DagNode *node, *rootnode;
-	DagNodeQueue *nqueue;
-	DagAdjList *itA;
-	int time;
-	int skip = 0;
-	ListBase tempbase;
-	Base *base;
-
-	BLI_listbase_clear(&tempbase);
-
-	build_dag(bmain, sce, DAG_RL_ALL_BUT_DATA);
-
-	dag_check_cycle(sce->theDag);
-
-	nqueue = queue_create(DAGQUEUEALLOC);
-	
-	for (node = sce->theDag->DagNode.first; node; node = node->next) {
-		node->color = DAG_WHITE;
-	}
-	
-	time = 1;
-	
-	rootnode = sce->theDag->DagNode.first;
-	rootnode->color = DAG_GRAY;
-	time++;
-	push_stack(nqueue, rootnode);
-	
-	while (nqueue->count) {
-		
-		skip = 0;
-		node = get_top_node_queue(nqueue);
-		
-		itA = node->child;
-		while (itA != NULL) {
-			if (itA->node->color == DAG_WHITE) {
-				itA->node->DFS_dvtm = time;
-				itA->node->color = DAG_GRAY;
-				
-				time++;
-				push_stack(nqueue, itA->node);
-				skip = 1;
-				break;
-			}
-			itA = itA->next;
-		}
-		
-		if (!skip) {
-			if (node) {
-				node = pop_queue(nqueue);
-				if (node->ob == sce)  /* we are done */
-					break;
-				node->color = DAG_BLACK;
-				
-				time++;
-				base = sce->base.first;
-				while (base && base->object != node->ob)
-					base = base->next;
-				if (base) {
-					BLI_remlink(&sce->base, base);
-					BLI_addhead(&tempbase, base);
-				}
-			}
-		}
-	}
-	
-	/* temporal correction for circular dependencies */
-	base = sce->base.first;
-	while (base) {
-		BLI_remlink(&sce->base, base);
-		BLI_addhead(&tempbase, base);
-		//if (G.debug & G_DEBUG)
-		printf("cyclic %s\n", base->object->id.name);
-		base = sce->base.first;
-	}
-	
-	sce->base = tempbase;
-	queue_delete(nqueue);
-	
-	/* all groups with objects in this scene gets resorted too */
-	scene_sort_groups(bmain, sce);
-	
-	if (G.debug & G_DEBUG) {
-		printf("\nordered\n");
-		for (base = sce->base.first; base; base = base->next) {
-			printf(" %s\n", base->object->id.name);
-		}
-	}
-
-	/* Make sure that new dependencies which came from invisible layers
-	 * are tagged for update (if they're needed for objects which were
-	 * tagged for update).
-	 */
-	dag_invisible_dependencies_check_flush(bmain, sce);
-}
-
-/* clear all dependency graphs */
-void DAG_relations_tag_update(Main *bmain)
-{
-	if (DEG_depsgraph_use_legacy()) {
-		Scene *sce;
-		for (sce = bmain->scene.first; sce; sce = sce->id.next) {
-			dag_scene_tag_rebuild(sce);
-		}
-	}
-	else {
-		/* New dependency graph. */
-		DEG_relations_tag_update(bmain);
-	}
-}
-
-/* rebuild dependency graph only for a given scene */
-void DAG_scene_relations_rebuild(Main *bmain, Scene *sce)
-{
-	if (DEG_depsgraph_use_legacy()) {
-		dag_scene_free(sce);
-		DAG_scene_relations_update(bmain, sce);
-	}
-	else {
-		/* New dependency graph. */
-		DEG_scene_relations_rebuild(bmain, sce);
-	}
-}
-
-/* create dependency graph if it was cleared or didn't exist yet */
-void DAG_scene_relations_update(Main *bmain, Scene *sce)
-{
-	if (DEG_depsgraph_use_legacy()) {
-		if (!sce->theDag || sce->theDag->need_update)
-			dag_scene_build(bmain, sce);
-	}
-	else {
-		/* New dependency graph. */
-		DEG_scene_relations_update(bmain, sce);
-	}
-}
-
-void DAG_scene_relations_validate(Main *bmain, Scene *sce)
-{
-	if (!DEG_depsgraph_use_legacy()) {
-		DEG_debug_scene_relations_validate(bmain, sce);
-	}
-}
-
-void DAG_scene_free(Scene *sce)
-{
-	if (DEG_depsgraph_use_legacy()) {
-		if (sce->theDag) {
-			free_forest(sce->theDag);
-			MEM_freeN(sce->theDag);
-			sce->theDag = NULL;
-		}
-	}
-	else {
-		if (sce->depsgraph) {
-			DEG_graph_free(sce->depsgraph);
-			sce->depsgraph = NULL;
-		}
-	}
-}
-
-static void lib_id_recalc_tag(Main *bmain, ID *id)
-{
-	id->tag |= LIB_TAG_ID_RECALC;
-	DAG_id_type_tag(bmain, GS(id->name));
-}
-
-static void lib_id_recalc_data_tag(Main *bmain, ID *id)
-{
-	id->tag |= LIB_TAG_ID_RECALC_DATA;
-	DAG_id_type_tag(bmain, GS(id->name));
-}
-
-/* node was checked to have lasttime != curtime and is if type ID_OB */
-static void flush_update_node(Main *bmain, DagNode *node, unsigned int layer, int curtime)
-{
-	DagAdjList *itA;
-	Object *ob, *obc;
-	int oldflag;
-	bool changed = false;
-	unsigned int all_layer;
-	
-	node->lasttime = curtime;
-	
-	ob = node->ob;
-	if (ob && (ob->recalc & OB_RECALC_ALL)) {
-		all_layer = node->scelay;
-
-		/* got an object node that changes, now check relations */
-		for (itA = node->child; itA; itA = itA->next) {
-			all_layer |= itA->lay;
-			/* the relationship is visible */
-			if ((itA->lay & layer)) { // XXX || (itA->node->ob == obedit)
-				if (itA->node->type == ID_OB) {
-					obc = itA->node->ob;
-					oldflag = obc->recalc;
-					
-					/* got a ob->obc relation, now check if flag needs flush */
-					if (ob->recalc & OB_RECALC_OB) {
-						if (itA->type & DAG_RL_OB_OB) {
-							//printf("ob %s changes ob %s\n", ob->id.name, obc->id.name);
-							obc->recalc |= OB_RECALC_OB;
-							lib_id_recalc_tag(bmain, &obc->id);
-						}
-						if (itA->type & DAG_RL_OB_DATA) {
-							//printf("ob %s changes obdata %s\n", ob->id.name, obc->id.name);
-							obc->recalc |= OB_RECALC_DATA;
-							lib_id_recalc_data_tag(bmain, &obc->id);
-						}
-					}
-					if (ob->recalc & OB_RECALC_DATA) {
-						if (itA->type & DAG_RL_DATA_OB) {
-							//printf("obdata %s changes ob %s\n", ob->id.name, obc->id.name);
-							obc->recalc |= OB_RECALC_OB;
-							lib_id_recalc_tag(bmain, &obc->id);
-						}
-						if (itA->type & DAG_RL_DATA_DATA) {
-							//printf("obdata %s changes obdata %s\n", ob->id.name, obc->id.name);
-							obc->recalc |= OB_RECALC_DATA;
-							lib_id_recalc_data_tag(bmain, &obc->id);
-						}
-					}
-					if (oldflag != obc->recalc) changed = 1;
-				}
-			}
-		}
-		/* even nicer, we can clear recalc flags...  */
-		if ((all_layer & layer) == 0) { // XXX && (ob != obedit)) {
-			/* but existing displaylists or derivedmesh should be freed */
-			if (ob->recalc & OB_RECALC_DATA)
-				BKE_object_free_derived_caches(ob);
-			
-			ob->recalc &= ~OB_RECALC_ALL;
-		}
-	}
-	
-	/* check case where child changes and parent forcing obdata to change */
-	/* should be done regardless if this ob has recalc set */
-	/* could merge this in with loop above...? (ton) */
-	for (itA = node->child; itA; itA = itA->next) {
-		/* the relationship is visible */
-		if ((itA->lay & layer)) {       // XXX  || (itA->node->ob == obedit)
-			if (itA->node->type == ID_OB) {
-				obc = itA->node->ob;
-				/* child moves */
-				if ((obc->recalc & OB_RECALC_ALL) == OB_RECALC_OB) {
-					/* parent has deforming info */
-					if (itA->type & (DAG_RL_OB_DATA | DAG_RL_DATA_DATA)) {
-						// printf("parent %s changes ob %s\n", ob->id.name, obc->id.name);
-						obc->recalc |= OB_RECALC_DATA;
-						lib_id_recalc_data_tag(bmain, &obc->id);
-					}
-				}
-			}
-		}
-	}
-	
-	/* we only go deeper if node not checked or something changed  */
-	for (itA = node->child; itA; itA = itA->next) {
-		if (changed || itA->node->lasttime != curtime)
-			flush_update_node(bmain, itA->node, layer, curtime);
-	}
-	
-}
-
-/* node was checked to have lasttime != curtime, and is of type ID_OB */
-static unsigned int flush_layer_node(Scene *sce, DagNode *node, int curtime)
-{
-	DagAdjList *itA;
-	
-	node->lasttime = curtime;
-	node->lay = node->scelay;
-	
-	for (itA = node->child; itA; itA = itA->next) {
-		if (itA->node->type == ID_OB) {
-			if (itA->node->lasttime != curtime) {
-				itA->lay = flush_layer_node(sce, itA->node, curtime);  /* lay is only set once for each relation */
-			}
-			else {
-				itA->lay = itA->node->lay;
-			}
-			
-			node->lay |= itA->lay;
-		}
-	}
-
-	return node->lay;
-}
-
-/* node was checked to have lasttime != curtime, and is of type ID_OB */
-static void flush_pointcache_reset(Main *bmain, Scene *scene, DagNode *node,
-                                   int curtime, unsigned int lay, bool reset)
-{
-	DagAdjList *itA;
-	Object *ob;
-	
-	node->lasttime = curtime;
-	
-	for (itA = node->child; itA; itA = itA->next) {
-		if (itA->node->type == ID_OB) {
-			if (itA->node->lasttime != curtime) {
-				ob = (Object *)(itA->node->ob);
-
-				if (reset || (ob->recalc & OB_RECALC_ALL)) {
-					if (BKE_ptcache_object_reset(scene, ob, PTCACHE_RESET_DEPSGRAPH)) {
-						/* Don't tag nodes which are on invisible layer. */
-						if (itA->node->lay & lay) {
-							ob->recalc |= OB_RECALC_DATA;
-							lib_id_recalc_data_tag(bmain, &ob->id);
-						}
-					}
-
-					flush_pointcache_reset(bmain, scene, itA->node, curtime, lay, true);
-				}
-				else
-					flush_pointcache_reset(bmain, scene, itA->node, curtime, lay, false);
-			}
-		}
-	}
-}
-
-/* flush layer flags to dependencies */
-static void dag_scene_flush_layers(Scene *sce, int lay)
-{
-	DagNode *node, *firstnode;
-	DagAdjList *itA;
-	Base *base;
-	int lasttime;
-
-	firstnode = sce->theDag->DagNode.first;  /* always scene node */
-
-	for (itA = firstnode->child; itA; itA = itA->next)
-		itA->lay = 0;
-
-	sce->theDag->time++;  /* so we know which nodes were accessed */
-	lasttime = sce->theDag->time;
-
-	/* update layer flags in nodes */
-	for (base = sce->base.first; base; base = base->next) {
-		node = dag_get_node(sce->theDag, base->object);
-		node->scelay = base->object->lay;
-	}
-
-	/* ensure cameras are set as if they are on a visible layer, because
-	 * they ared still used for rendering or setting the camera view
-	 *
-	 * XXX, this wont work for local view / unlocked camera's */
-	if (sce->camera) {
-		node = dag_get_node(sce->theDag, sce->camera);
-		node->scelay |= lay;
-	}
-
-#ifdef DURIAN_CAMERA_SWITCH
-	{
-		TimeMarker *m;
-
-		for (m = sce->markers.first; m; m = m->next) {
-			if (m->camera) {
-				node = dag_get_node(sce->theDag, m->camera);
-				node->scelay |= lay;
-			}
-		}
-	}
-#endif
-
-	/* flush layer nodes to dependencies */
-	for (itA = firstnode->child; itA; itA = itA->next)
-		if (itA->node->lasttime != lasttime && itA->node->type == ID_OB)
-			flush_layer_node(sce, itA->node, lasttime);
-}
-
-static void dag_tag_renderlayers(Scene *sce, unsigned int lay)
-{
-	if (sce->nodetree) {
-		bNode *node;
-		Base *base;
-		unsigned int lay_changed = 0;
-		
-		for (base = sce->base.first; base; base = base->next)
-			if (base->lay & lay)
-				if (base->object->recalc)
-					lay_changed |= base->lay;
-			
-		for (node = sce->nodetree->nodes.first; node; node = node->next) {
-			if (node->id == (ID *)sce) {
-				SceneRenderLayer *srl = BLI_findlink(&sce->r.layers, node->custom1);
-				if (srl && (srl->lay & lay_changed))
-					nodeUpdate(sce->nodetree, node);
-			}
-		}
-	}
-}
-
-/* flushes all recalc flags in objects down the dependency tree */
-void DAG_scene_flush_update(Main *bmain, Scene *sce, unsigned int lay, const short time)
-{
-	DagNode *firstnode;
-	DagAdjList *itA;
-	Object *ob;
-	int lasttime;
-
-	if (!DEG_depsgraph_use_legacy()) {
-		return;
-	}
-
-	if (sce->theDag == NULL || sce->theDag->need_update) {
-		printf("DAG zero... not allowed to happen!\n");
-		DAG_scene_relations_update(bmain, sce);
-	}
-	
-	firstnode = sce->theDag->DagNode.first;  /* always scene node */
-
-	/* first we flush the layer flags */
-	dag_scene_flush_layers(sce, lay);
-
-	/* then we use the relationships + layer info to flush update events */
-	sce->theDag->time++;  /* so we know which nodes were accessed */
-	lasttime = sce->theDag->time;
-	for (itA = firstnode->child; itA; itA = itA->next)
-		if (itA->node->lasttime != lasttime && itA->node->type == ID_OB)
-			flush_update_node(bmain, itA->node, lay, lasttime);
-
-	/* if update is not due to time change, do pointcache clears */
-	if (!time) {
-		sce->theDag->time++;  /* so we know which nodes were accessed */
-		lasttime = sce->theDag->time;
-		for (itA = firstnode->child; itA; itA = itA->next) {
-			if (itA->node->lasttime != lasttime && itA->node->type == ID_OB) {
-				ob = (Object *)(itA->node->ob);
-
-				if (ob->recalc & OB_RECALC_ALL) {
-					if (BKE_ptcache_object_reset(sce, ob, PTCACHE_RESET_DEPSGRAPH)) {
-						ob->recalc |= OB_RECALC_DATA;
-						lib_id_recalc_data_tag(bmain, &ob->id);
-					}
-
-					flush_pointcache_reset(bmain, sce, itA->node, lasttime,
-					                       lay, true);
-				}
-				else
-					flush_pointcache_reset(bmain, sce, itA->node, lasttime,
-					                       lay, false);
-			}
-		}
-	}
-	
-	dag_tag_renderlayers(sce, lay);
-}
-
-static bool modifier_nlastrips_use_time(ListBase *strips)
-{
-	NlaStrip *strip;
-	
-	if (strips) {
-		for (strip = strips->first; strip; strip = strip->next) {
-			if (modifier_nlastrips_use_time(&strip->strips)) {
-				return true;
-			}
-			else if (strip->act) {
-				FCurve *fcu;
-				
-				for (fcu = strip->act->curves.first; fcu; fcu = fcu->next) {
-					if (fcu->rna_path && strstr(fcu->rna_path, "modifiers["))
-						return true;
-				}
-			}
-		}
-	}
-	
-	return false;
-}
-
-static bool object_modifiers_use_time(Object *ob)
-{
-	ModifierData *md;
-	
-	/* check if a modifier in modifier stack needs time input */
-	for (md = ob->modifiers.first; md; md = md->next) {
-		if (modifier_dependsOnTime(md))
-			return true;
-	}
-	
-	/* check whether any modifiers are animated */
-	if (ob->adt) {
-		AnimData *adt = ob->adt;
-		NlaTrack *nlt;
-		FCurve *fcu;
-		
-		/* action - check for F-Curves with paths containing 'modifiers[' */
-		if (adt->action) {
-			for (fcu = adt->action->curves.first; fcu; fcu = fcu->next) {
-				if (fcu->rna_path && strstr(fcu->rna_path, "modifiers["))
-					return true;
-			}
-		}
-		
-		/* This here allows modifier properties to get driven and still update properly
-		 *
-		 * Workaround to get [#26764] (e.g. subsurf levels not updating when animated/driven)
-		 * working, without the updating problems ([#28525] [#28690] [#28774] [#28777]) caused
-		 * by the RNA updates cache introduced in r.38649
-		 */
-		for (fcu = adt->drivers.first; fcu; fcu = fcu->next) {
-			if (fcu->rna_path && strstr(fcu->rna_path, "modifiers["))
-				return true;
-		}
-		
-		/* Also check NLA Strips... [#T45938] */
-		for (nlt = adt->nla_tracks.first; nlt; nlt = nlt->next) {
-			if (modifier_nlastrips_use_time(&nlt->strips))
-				return true;
-		}
-	}
-	
-	return false;
-}
-
-static short animdata_use_time(AnimData *adt)
-{
-	NlaTrack *nlt;
-	
-	if (adt == NULL) return 0;
-	
-	/* check action - only if assigned, and it has anim curves */
-	if (adt->action && adt->action->curves.first)
-		return 1;
-	
-	/* check NLA tracks + strips */
-	for (nlt = adt->nla_tracks.first; nlt; nlt = nlt->next) {
-		if (nlt->strips.first)
-			return 1;
-	}
-	
-	/* If we have drivers, more likely than not, on a frame change
-	 * they'll need updating because their owner changed
-	 * 
-	 * This is kindof a hack to get around a whole host of problems
-	 * involving drivers using non-object datablock data (which the 
-	 * depsgraph currently has no way of representing let alone correctly
-	 * dependency sort+tagging). By doing this, at least we ensure that 
-	 * some commonly attempted drivers (such as scene -> current frame;
-	 * see "Driver updates fail" thread on Bf-committers dated July 2)
-	 * will work correctly, and that other non-object datablocks will have
-	 * their drivers update at least on frame change.
-	 *
-	 * -- Aligorith, July 4 2011
-	 */
-	if (adt->drivers.first)
-		return 1;
-	
-	return 0;
-}
-
-static void dag_object_time_update_flags(Main *bmain, Scene *scene, Object *ob)
-{
-	if (ob->constraints.first) {
-		bConstraint *con;
-		for (con = ob->constraints.first; con; con = con->next) {
-			const bConstraintTypeInfo *cti = BKE_constraint_typeinfo_get(con);
-			ListBase targets = {NULL, NULL};
-			bConstraintTarget *ct;
-			
-			if (cti) {
-				/* special case for camera tracking -- it doesn't use targets to define relations */
-				if (ELEM(cti->type,
-				         CONSTRAINT_TYPE_FOLLOWTRACK,
-				         CONSTRAINT_TYPE_CAMERASOLVER,
-				         CONSTRAINT_TYPE_OBJECTSOLVER,
-				         CONSTRAINT_TYPE_TRANSFORM_CACHE))
-				{
-					ob->recalc |= OB_RECALC_OB;
-				}
-				else if (cti->get_constraint_targets) {
-					cti->get_constraint_targets(con, &targets);
-					
-					for (ct = targets.first; ct; ct = ct->next) {
-						if (ct->tar) {
-							ob->recalc |= OB_RECALC_OB;
-							break;
-						}
-					}
-					
-					if (cti->flush_constraint_targets)
-						cti->flush_constraint_targets(con, &targets, 1);
-				}
-				
-			}
-		}
-	}
-	
-	if (ob->parent) {
-		/* motion path or bone child */
-		if (ob->parent->type == OB_CURVE || ob->parent->type == OB_ARMATURE) ob->recalc |= OB_RECALC_OB;
-	}
-	
-#if 0 // XXX old animation system
-	if (ob->nlastrips.first) {
-		if (ob->dup_group) {
-			bActionStrip *strip;
-			/* this case is for groups with nla, whilst nla target has no action or nla */
-			for (strip = ob->nlastrips.first; strip; strip = strip->next) {
-				if (strip->object)
-					strip->object->recalc |= OB_RECALC_ALL;
-			}
-		}
-	}
-#endif // XXX old animation system
-	
-	if (animdata_use_time(ob->adt)) {
-		ob->recalc |= OB_RECALC_OB;
-		ob->adt->recalc |= ADT_RECALC_ANIM;
-	}
-	
-	if ((ob->adt) && (ob->type == OB_ARMATURE)) ob->recalc |= OB_RECALC_DATA;
-	
-	if (object_modifiers_use_time(ob)) ob->recalc |= OB_RECALC_DATA;
-	if ((ob->pose) && (ob->pose->flag & POSE_CONSTRAINTS_TIMEDEPEND)) ob->recalc |= OB_RECALC_DATA;
-	
-	// XXX: scene here may not be the scene that contains the rigidbody world affecting this!
-	if (ob->rigidbody_object && BKE_scene_check_rigidbody_active(scene))
-		ob->recalc |= OB_RECALC_OB;
-	
-	{
-		AnimData *adt = BKE_animdata_from_id((ID *)ob->data);
-		Mesh *me;
-		Curve *cu;
-		Lattice *lt;
-		
-		switch (ob->type) {
-			case OB_MESH:
-				me = ob->data;
-				if (me->key) {
-					if (!(ob->shapeflag & OB_SHAPE_LOCK)) {
-						ob->recalc |= OB_RECALC_DATA;
-					}
-				}
-				if (ob->particlesystem.first)
-					ob->recalc |= OB_RECALC_DATA;
-				break;
-			case OB_CURVE:
-			case OB_SURF:
-				cu = ob->data;
-				if (cu->key) {
-					if (!(ob->shapeflag & OB_SHAPE_LOCK)) {
-						ob->recalc |= OB_RECALC_DATA;
-					}
-				}
-				break;
-			case OB_FONT:
-				cu = ob->data;
-				if (BLI_listbase_is_empty(&cu->nurb) && cu->str && cu->vfont)
-					ob->recalc |= OB_RECALC_DATA;
-				break;
-			case OB_LATTICE:
-				lt = ob->data;
-				if (lt->key) {
-					if (!(ob->shapeflag & OB_SHAPE_LOCK)) {
-						ob->recalc |= OB_RECALC_DATA;
-					}
-				}
-				break;
-			case OB_MBALL:
-				if (ob->transflag & OB_DUPLI) ob->recalc |= OB_RECALC_DATA;
-				break;
-			case OB_EMPTY:
-				/* update animated images */
-				if (ob->empty_drawtype == OB_EMPTY_IMAGE && ob->data)
-					if (BKE_image_is_animated(ob->data))
-						ob->recalc |= OB_RECALC_DATA;
-				break;
-		}
-		
-		if (animdata_use_time(adt)) {
-			ob->recalc |= OB_RECALC_DATA;
-			adt->recalc |= ADT_RECALC_ANIM;
-		}
-
-		if (ob->particlesystem.first) {
-			ParticleSystem *psys = ob->particlesystem.first;
-
-			for (; psys; psys = psys->next) {
-				if (psys_check_enabled(ob, psys, G.is_rendering)) {
-					ob->recalc |= OB_RECALC_DATA;
-					break;
-				}
-			}
-		}
-	}
-
-	if (ob->recalc & OB_RECALC_OB)
-		lib_id_recalc_tag(bmain, &ob->id);
-	if (ob->recalc & OB_RECALC_DATA)
-		lib_id_recalc_data_tag(bmain, &ob->id);
-
-}
-
-/* recursively update objects in groups, each group is done at most once */
-static void dag_group_update_flags(Main *bmain, Scene *scene, Group *group, const bool do_time)
-{
-	GroupObject *go;
-
-	if (group->id.tag & LIB_TAG_DOIT)
-		return;
-	
-	group->id.tag |= LIB_TAG_DOIT;
-
-	for (go = group->gobject.first; go; go = go->next) {
-		if (do_time)
-			dag_object_time_update_flags(bmain, scene, go->ob);
-		if (go->ob->dup_group)
-			dag_group_update_flags(bmain, scene, go->ob->dup_group, do_time);
-	}
-}
-
-/* flag all objects that need recalc, for changes in time for example */
-/* do_time: make this optional because undo resets objects to their animated locations without this */
-void DAG_scene_update_flags(Main *bmain, Scene *scene, unsigned int lay, const bool do_time, const bool do_invisible_flush)
-{
-	Base *base;
-	Object *ob;
-	Group *group;
-	GroupObject *go;
-	Scene *sce_iter;
-
-	BKE_main_id_tag_idcode(bmain, ID_GR, LIB_TAG_DOIT, false);
-
-	/* set ob flags where animated systems are */
-	for (SETLOOPER(scene, sce_iter, base)) {
-		ob = base->object;
-
-		if (do_time) {
-			/* now if DagNode were part of base, the node->lay could be checked... */
-			/* we do all now, since the scene_flush checks layers and clears recalc flags even */
-			
-			/* NOTE: "sce_iter" not "scene" so that rigidbodies in background scenes work 
-			 * (i.e. muting + rbw availability can be checked and tagged properly) [#33970] 
-			 */
-			dag_object_time_update_flags(bmain, sce_iter, ob);
-		}
-
-		/* recursively tag groups with LIB_TAG_DOIT, and update flags for objects */
-		if (ob->dup_group)
-			dag_group_update_flags(bmain, scene, ob->dup_group, do_time);
-	}
-
-	for (sce_iter = scene; sce_iter; sce_iter = sce_iter->set)
-		DAG_scene_flush_update(bmain, sce_iter, lay, 1);
-	
-	if (do_time) {
-		/* test: set time flag, to disable baked systems to update */
-		for (SETLOOPER(scene, sce_iter, base)) {
-			ob = base->object;
-			if (ob->recalc & OB_RECALC_ALL)
-				ob->recalc |= OB_RECALC_TIME;
-		}
-
-		/* hrmf... an exception to look at once, for invisible camera object we do it over */
-		if (scene->camera)
-			dag_object_time_update_flags(bmain, scene, scene->camera);
-	}
-
-	/* and store the info in groupobject */
-	for (group = bmain->group.first; group; group = group->id.next) {
-		if (group->id.tag & LIB_TAG_DOIT) {
-			for (go = group->gobject.first; go; go = go->next) {
-				go->recalc = go->ob->recalc;
-				// printf("ob %s recalc %d\n", go->ob->id.name, go->recalc);
-			}
-			group->id.tag &= ~LIB_TAG_DOIT;
-		}
-	}
-
-	if (do_invisible_flush) {
-		dag_invisible_dependencies_check_flush(bmain, scene);
-	}
-}
-
-/* struct returned by DagSceneLayer */
-typedef struct DagSceneLayer {
-	struct DagSceneLayer *next, *prev;
-	Scene *scene;
-	unsigned int layer;
-} DagSceneLayer;
-
-/* returns visible scenes with valid DAG */
-static void dag_current_scene_layers(Main *bmain, ListBase *lb)
-{
-	wmWindowManager *wm;
-	wmWindow *win;
-	
-	BLI_listbase_clear(lb);
-
-	/* if we have a windowmanager, look into windows */
-	if ((wm = bmain->wm.first)) {
-		
-		BKE_main_id_flag_listbase(&bmain->scene, LIB_TAG_DOIT, 1);
-
-		for (win = wm->windows.first; win; win = win->next) {
-			if (win->screen && win->screen->scene->theDag) {
-				Scene *scene = win->screen->scene;
-				DagSceneLayer *dsl;
-
-				if (scene->id.tag & LIB_TAG_DOIT) {
-					dsl = MEM_mallocN(sizeof(DagSceneLayer), "dag scene layer");
-
-					BLI_addtail(lb, dsl);
-
-					dsl->scene = scene;
-					dsl->layer = BKE_screen_visible_layers(win->screen, scene);
-
-					scene->id.tag &= ~LIB_TAG_DOIT;
-				}
-				else {
-					/* It is possible that multiple windows shares the same scene
-					 * and have different layers visible.
-					 *
-					 * Here we deal with such cases by squashing layers bits from
-					 * multiple windoew to the DagSceneLayer.
-					 *
-					 * TODO(sergey): Such a lookup could be optimized perhaps,
-					 * however should be fine for now since we usually have only
-					 * few open windows.
-					 */
-					for (dsl = lb->first; dsl; dsl = dsl->next) {
-						if (dsl->scene == scene) {
-							dsl->layer |= BKE_screen_visible_layers(win->screen, scene);
-							break;
-						}
-					}
-				}
-			}
-		}
-	}
-	else {
-		/* if not, use the first sce */
-		DagSceneLayer *dsl = MEM_mallocN(sizeof(DagSceneLayer), "dag scene layer");
-		
-		BLI_addtail(lb, dsl);
-		
-		dsl->scene = bmain->scene.first;
-		dsl->layer = dsl->scene->lay;
-
-		/* XXX for background mode, we should get the scene
-		 * from somewhere, for the -S option, but it's in
-		 * the context, how to get it here? */
-	}
-}
-
-static void dag_group_on_visible_update(Scene *scene, Group *group)
-{
-	GroupObject *go;
-
-	if (group->id.tag & LIB_TAG_DOIT)
-		return;
-	
-	group->id.tag |= LIB_TAG_DOIT;
-
-	for (go = group->gobject.first; go; go = go->next) {
-		if (ELEM(go->ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_MBALL, OB_LATTICE)) {
-			go->ob->recalc |= OB_RECALC_DATA;
-			go->ob->id.tag |= LIB_TAG_DOIT;
-			lib_id_recalc_tag(G.main, &go->ob->id);
-		}
-		if (go->ob->proxy_from) {
-			go->ob->recalc |= OB_RECALC_OB;
-			go->ob->id.tag |= LIB_TAG_DOIT;
-			lib_id_recalc_tag(G.main, &go->ob->id);
-		}
-
-		if (go->ob->dup_group)
-			dag_group_on_visible_update(scene, go->ob->dup_group);
-	}
-}
-
-void DAG_on_visible_update(Main *bmain, const bool do_time)
-{
-	ListBase listbase;
-	DagSceneLayer *dsl;
-
-	if (!DEG_depsgraph_use_legacy()) {
-		/* Inform new dependnecy graphs about visibility changes. */
-		DEG_on_visible_update(bmain, do_time);
-		return;
-	}
-
-	/* get list of visible scenes and layers */
-	dag_current_scene_layers(bmain, &listbase);
-	
-	for (dsl = listbase.first; dsl; dsl = dsl->next) {
-		Scene *scene = dsl->scene;
-		Scene *sce_iter;
-		Base *base;
-		Object *ob;
-		DagNode *node;
-		unsigned int lay = dsl->layer, oblay;
-
-		/* derivedmeshes and displists are not saved to file so need to be
-		 * remade, tag them so they get remade in the scene update loop,
-		 * note armature poses or object matrices are preserved and do not
-		 * require updates, so we skip those */
-		for (sce_iter = scene; sce_iter; sce_iter = sce_iter->set)
-			dag_scene_flush_layers(sce_iter, lay);
-
-		BKE_main_id_tag_idcode(bmain, ID_GR, LIB_TAG_DOIT, false);
-
-		for (SETLOOPER(scene, sce_iter, base)) {
-			ob = base->object;
-			node = (sce_iter->theDag) ? dag_get_node(sce_iter->theDag, ob) : NULL;
-			oblay = (node) ? node->lay : ob->lay;
-
-			if ((oblay & lay) & ~scene->lay_updated) {
-				/* TODO(sergey): Why do we need armature here now but didn't need before? */
-				if (ELEM(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_MBALL, OB_LATTICE, OB_ARMATURE)) {
-					ob->recalc |= OB_RECALC_DATA;
-					lib_id_recalc_tag(bmain, &ob->id);
-				}
-				/* This should not be needed here, but in some cases, like after a redo, we can end up with
-				 * a wrong final matrix (see T42472).
-				 * Quoting Sergey, this comes from BKE_object_handle_update_ex, which is calling
-				 * BKE_object_where_is_calc_ex when it shouldn't, but that issue is not easily fixable.
-				 */
-				else {
-					ob->recalc |= OB_RECALC_OB;
-					lib_id_recalc_tag(bmain, &ob->id);
-				}
-				if (ob->proxy && (ob->proxy_group == NULL)) {
-					ob->proxy->recalc |= OB_RECALC_DATA;
-					lib_id_recalc_tag(bmain, &ob->id);
-				}
-				if (ob->dup_group)
-					dag_group_on_visible_update(scene, ob->dup_group);
-			}
-		}
-
-		BKE_main_id_tag_idcode(bmain, ID_GR, LIB_TAG_DOIT, false);
-
-		/* now tag update flags, to ensure deformers get calculated on redraw */
-		DAG_scene_update_flags(bmain, scene, lay, do_time, true);
-		scene->lay_updated |= lay;
-	}
-	
-	BLI_freelistN(&listbase);
-
-	/* hack to get objects updating on layer changes */
-	DAG_id_type_tag(bmain, ID_OB);
-
-	/* so masks update on load */
-	if (bmain->mask.first) {
-		Mask *mask;
-
-		for (mask = bmain->mask.first; mask; mask = mask->id.next) {
-			DAG_id_tag_update(&mask->id, 0);
-		}
-	}
-}
-
-static void dag_id_flush_update__isDependentTexture(
-        void *userData, Object *UNUSED(ob), ID **idpoin, int UNUSED(cd_flag))
-{
-	struct { ID *id; bool is_dependent; } *data = userData;
-	
-	if (*idpoin && GS((*idpoin)->name) == ID_TE) {
-		if (data->id == (*idpoin))
-			data->is_dependent = 1;
-	}
-}
-
-static void dag_id_flush_update(Main *bmain, Scene *sce, ID *id)
-{
-	Object *obt, *ob = NULL;
-	short idtype;
-
-	/* here we flush a few things before actual scene wide flush, mostly
-	 * due to only objects and not other datablocks being in the depsgraph */
-
-	/* set flags & pointcache for object */
-	if (GS(id->name) == ID_OB) {
-		ob = (Object *)id;
-		BKE_ptcache_object_reset(sce, ob, PTCACHE_RESET_DEPSGRAPH);
-
-		/* So if someone tagged object recalc directly,
-		 * id_tag_update bit-field stays relevant
-		 */
-		if (ob->recalc & OB_RECALC_ALL) {
-			DAG_id_type_tag(bmain, GS(id->name));
-		}
-
-		if (ob->recalc & OB_RECALC_DATA) {
-			/* all users of this ob->data should be checked */
-			id = ob->data;
-
-			/* no point in trying in this cases */
-			if (id && id->us <= 1) {
-				dag_editors_id_update(bmain, id);
-				id = NULL;
-			}
-		}
-	}
-
-	/* set flags & pointcache for object data */
-	if (id) {
-		idtype = GS(id->name);
-
-
-		if (OB_DATA_SUPPORT_ID(idtype)) {
-			for (obt = bmain->object.first; obt; obt = obt->id.next) {
-				if (!(ob && obt == ob) && obt->data == id) {
-					obt->recalc |= OB_RECALC_DATA;
-					lib_id_recalc_data_tag(bmain, &obt->id);
-					BKE_ptcache_object_reset(sce, obt, PTCACHE_RESET_DEPSGRAPH);
-				}
-			}
-		}
-		else if (idtype == ID_VF) {
-			for (obt = bmain->object.first; obt; obt = obt->id.next) {
-				if (obt->type == OB_FONT) {
-					Curve *cu = obt->data;
-					if (ELEM((struct VFont *)id, CURVE_VFONT_ANY(cu))) {
-						obt->recalc |= OB_RECALC_DATA;
-						lib_id_recalc_data_tag(bmain, &obt->id);
-					}
-				}
-			}
-		}
-
-		/* set flags based on textures - can influence depgraph via modifiers */
-		if (idtype == ID_TE) {
-			for (obt = bmain->object.first; obt; obt = obt->id.next) {
-				struct { ID *id; bool is_dependent; } data;
-				data.id = id;
-				data.is_dependent = 0;
-
-				modifiers_foreachIDLink(obt, dag_id_flush_update__isDependentTexture, &data);
-				if (data.is_dependent) {
-					obt->recalc |= OB_RECALC_DATA;
-					lib_id_recalc_data_tag(bmain, &obt->id);
-				}
-
-				/* particle settings can use the texture as well */
-				if (obt->particlesystem.first) {
-					ParticleSystem *psys = obt->particlesystem.first;
-					MTex **mtexp, *mtex;
-					int a;
-					for (; psys; psys = psys->next) {
-						mtexp = psys->part->mtex;
-						for (a = 0; a < MAX_MTEX; a++, mtexp++) {
-							mtex = *mtexp;
-							if (mtex && mtex->tex == (Tex *)id) {
-								obt->recalc |= OB_RECALC_DATA;
-								lib_id_recalc_data_tag(bmain, &obt->id);
-
-								if (mtex->mapto & PAMAP_INIT)
-									psys->recalc |= PSYS_RECALC_RESET;
-								if (mtex->mapto & PAMAP_CHILD)
-									psys->recalc |= PSYS_RECALC_CHILD;
-
-								BKE_ptcache_object_reset(sce, obt, PTCACHE_RESET_DEPSGRAPH);
-							}
-						}
-					}
-				}
-			}
-		}
-		
-		/* set flags based on ShapeKey */
-		if (idtype == ID_KE) {
-			for (obt = bmain->object.first; obt; obt = obt->id.next) {
-				Key *key = BKE_key_from_object(obt);
-				if (!(ob && obt == ob) && ((ID *)key == id)) {
-					obt->flag |= (OB_RECALC_OB | OB_RECALC_DATA);
-					lib_id_recalc_tag(bmain, &obt->id);
-					lib_id_recalc_data_tag(bmain, &obt->id);
-					BKE_ptcache_object_reset(sce, obt, PTCACHE_RESET_DEPSGRAPH);
-				}
-			}
-		}
-		
-		/* set flags based on particle settings */
-		if (idtype == ID_PA) {
-			ParticleSystem *psys;
-			for (obt = bmain->object.first; obt; obt = obt->id.next)
-				for (psys = obt->particlesystem.first; psys; psys = psys->next)
-					if (&psys->part->id == id)
-						BKE_ptcache_object_reset(sce, obt, PTCACHE_RESET_DEPSGRAPH);
-		}
-
-		if (ELEM(idtype, ID_MA, ID_TE)) {
-			obt = sce->basact ? sce->basact->object : NULL;
-			if (obt && obt->mode & OB_MODE_TEXTURE_PAINT) {
-				BKE_texpaint_slots_refresh_object(sce, obt);
-				BKE_paint_proj_mesh_data_check(sce, obt, NULL, NULL, NULL, NULL);
-				GPU_drawobject_free(obt->derivedFinal);
-			}
-		}
-
-		if (idtype == ID_MC) {
-			MovieClip *clip = (MovieClip *) id;
-
-			BKE_tracking_dopesheet_tag_update(&clip->tracking);
-
-			for (obt = bmain->object.first; obt; obt = obt->id.next) {
-				bConstraint *con;
-				for (con = obt->constraints.first; con; con = con->next) {
-					const bConstraintTypeInfo *cti = BKE_constraint_typeinfo_get(con);
-					if (ELEM(cti->type, CONSTRAINT_TYPE_FOLLOWTRACK, CONSTRAINT_TYPE_CAMERASOLVER,
-					          CONSTRAINT_TYPE_OBJECTSOLVER))
-					{
-						obt->recalc |= OB_RECALC_OB;
-						lib_id_recalc_tag(bmain, &obt->id);
-						break;
-					}
-				}
-			}
-
-			if (sce->nodetree) {
-				bNode *node;
-
-				for (node = sce->nodetree->nodes.first; node; node = node->next) {
-					if (node->id == id) {
-						nodeUpdate(sce->nodetree, node);
-					}
-				}
-			}
-		}
-
-		/* Not pretty to iterate all the nodes here, but it's as good as it
-		 * could be with the current depsgraph design/
-		 */
-		if (idtype == ID_IM) {
-			FOREACH_NODETREE(bmain, ntree, parent_id) {
-				if (ntree->type == NTREE_SHADER) {
-					bNode *node;
-					for (node = ntree->nodes.first; node; node = node->next) {
-						if (node->id == id) {
-							lib_id_recalc_tag(bmain, &ntree->id);
-							break;
-						}
-					}
-				}
-			} FOREACH_NODETREE_END
-		}
-
-		if (idtype == ID_MSK) {
-			if (sce->nodetree) {
-				bNode *node;
-
-				for (node = sce->nodetree->nodes.first; node; node = node->next) {
-					if (node->id == id) {
-						nodeUpdate(sce->nodetree, node);
-					}
-				}
-			}
-		}
-
-		/* camera's matrix is used to orient reconstructed stuff,
-		 * so it should happen tracking-related constraints recalculation
-		 * when camera is changing (sergey) */
-		if (sce->camera && &sce->camera->id == id) {
-			MovieClip *clip = BKE_object_movieclip_get(sce, sce->camera, true);
-
-			if (clip)
-				dag_id_flush_update(bmain, sce, &clip->id);
-		}
-
-		/* update editors */
-		dag_editors_id_update(bmain, id);
-	}
-}
-
-void DAG_ids_flush_tagged(Main *bmain)
-{
-	ListBase listbase;
-	DagSceneLayer *dsl;
-	ListBase *lbarray[MAX_LIBARRAY];
-	int a;
-	bool do_flush = false;
-
-	if (!DEG_depsgraph_use_legacy()) {
-		DEG_ids_flush_tagged(bmain);
-		return;
-	}
-
-	/* get list of visible scenes and layers */
-	dag_current_scene_layers(bmain, &listbase);
-
-	if (BLI_listbase_is_empty(&listbase))
-		return;
-
-	/* loop over all ID types */
-	a  = set_listbasepointers(bmain, lbarray);
-
-	while (a--) {
-		ListBase *lb = lbarray[a];
-		ID *id = lb->first;
-
-		if (id && bmain->id_tag_update[BKE_idcode_to_index(GS(id->name))]) {
-			for (; id; id = id->next) {
-				if (id->tag & (LIB_TAG_ID_RECALC | LIB_TAG_ID_RECALC_DATA)) {
-					
-					for (dsl = listbase.first; dsl; dsl = dsl->next)
-						dag_id_flush_update(bmain, dsl->scene, id);
-					
-					do_flush = true;
-				}
-			}
-		}
-	}
-
-	/* flush changes to other objects */
-	if (do_flush) {
-		for (dsl = listbase.first; dsl; dsl = dsl->next)
-			DAG_scene_flush_update(bmain, dsl->scene, dsl->layer, 0);
-	}
-	
-	BLI_freelistN(&listbase);
-}
-
-void DAG_ids_check_recalc(Main *bmain, Scene *scene, bool time)
-{
-	ListBase *lbarray[MAX_LIBARRAY];
-	int a;
-	bool updated = false;
-
-	if (!DEG_depsgraph_use_legacy()) {
-		DEG_ids_check_recalc(bmain, scene, time);
-		return;
-	}
-
-	/* loop over all ID types */
-	a  = set_listbasepointers(bmain, lbarray);
-
-	while (a--) {
-		ListBase *lb = lbarray[a];
-		ID *id = lb->first;
-
-		if (id && bmain->id_tag_update[BKE_idcode_to_index(GS(id->name))]) {
-			updated = true;
-			break;
-		}
-	}
-
-	dag_editors_scene_update(bmain, scene, (updated || time));
-}
-
-/* It is possible that scene_update_post and frame_update_post handlers
- * will modify objects. The issue is that DAG_ids_clear_recalc is called
- * just after callbacks, which leaves objects with recalc flags but no
- * corresponding bit in ID recalc bitfield. This leads to some kind of
- * regression when using ID type tag fields to check whether there objects
- * to be updated internally comparing threaded DAG with legacy one.
- *
- * For now let's have a workaround which will preserve tag for ID_OB
- * if there're objects with OB_RECALC_ALL bits. This keeps behavior
- * unchanged comparing with 2.69 release.
- *
- * TODO(sergey): Need to get rid of such a workaround.
- *
- *                                                 - sergey -
- */
-
-#define POST_UPDATE_HANDLER_WORKAROUND
-
-void DAG_ids_clear_recalc(Main *bmain)
-{
-	ListBase *lbarray[MAX_LIBARRAY];
-	bNodeTree *ntree;
-	int a;
-
-#ifdef POST_UPDATE_HANDLER_WORKAROUND
-	bool have_updated_objects = false;
-
-	if (DAG_id_type_tagged(bmain, ID_OB)) {
-		ListBase listbase;
-		DagSceneLayer *dsl;
-
-		/* We need to check all visible scenes, otherwise resetting
-		 * OB_ID changed flag will only work fine for first scene of
-		 * multiple visible and all the rest will skip update.
-		 *
-		 * This could also lead to wrong behavior scene update handlers
-		 * because of missing ID datablock changed flags.
-		 *
-		 * This is a bit of a bummer to allocate list here, but likely
-		 * it wouldn't become too much bad because it only happens when
-		 * objects were actually changed.
-		 */
-		dag_current_scene_layers(bmain, &listbase);
-
-		for (dsl = listbase.first; dsl; dsl = dsl->next) {
-			Scene *scene = dsl->scene;
-			DagNode *node;
-			for (node = scene->theDag->DagNode.first;
-			     node != NULL && have_updated_objects == false;
-			     node = node->next)
-			{
-				if (node->type == ID_OB) {
-					Object *object = (Object *) node->ob;
-					if (object->recalc & OB_RECALC_ALL) {
-						have_updated_objects = true;
-						break;
-					}
-				}
-			}
-		}
-
-		BLI_freelistN(&listbase);
-	}
-#endif
-
-	/* loop over all ID types */
-	a  = set_listbasepointers(bmain, lbarray);
-
-	while (a--) {
-		ListBase *lb = lbarray[a];
-		ID *id = lb->first;
-
-		if (id && bmain->id_tag_update[BKE_idcode_to_index(GS(id->name))]) {
-			for (; id; id = id->next) {
-				if (id->tag & (LIB_TAG_ID_RECALC | LIB_TAG_ID_RECALC_DATA))
-					id->tag &= ~(LIB_TAG_ID_RECALC | LIB_TAG_ID_RECALC_DATA);
-
-				/* some ID's contain semi-datablock nodetree */
-				ntree = ntreeFromID(id);
-				if (ntree && (ntree->id.tag & (LIB_TAG_ID_RECALC | LIB_TAG_ID_RECALC_DATA)))
-					ntree->id.tag &= ~(LIB_TAG_ID_RECALC | LIB_TAG_ID_RECALC_DATA);
-			}
-		}
-	}
-
-	memset(bmain->id_tag_update, 0, sizeof(bmain->id_tag_update));
-
-#ifdef POST_UPDATE_HANDLER_WORKAROUND
-	if (have_updated_objects) {
-		DAG_id_type_tag(bmain, ID_OB);
-	}
-#endif
-}
-
-void DAG_id_tag_update_ex(Main *bmain, ID *id, short flag)
-{
-	if (!DEG_depsgraph_use_legacy()) {
-		DEG_id_tag_update_ex(bmain, id, flag);
-		return;
-	}
-
-	if (id == NULL) return;
-
-	if (G.debug & G_DEBUG_DEPSGRAPH) {
-		printf("%s: id=%s flag=%d\n", __func__, id->name, flag);
-	}
-
-	/* tag ID for update */
-	if (flag) {
-		if (flag & OB_RECALC_OB)
-			lib_id_recalc_tag(bmain, id);
-		if (flag & (OB_RECALC_DATA | PSYS_RECALC))
-			lib_id_recalc_data_tag(bmain, id);
-	}
-	else
-		lib_id_recalc_tag(bmain, id);
-
-	/* flag is for objects and particle systems */
-	if (flag) {
-		Object *ob;
-		short idtype = GS(id->name);
-
-		if (idtype == ID_OB) {
-			/* only quick tag */
-			ob = (Object *)id;
-			ob->recalc |= (flag & OB_RECALC_ALL);
-		}
-		else if (idtype == ID_PA) {
-			ParticleSystem *psys;
-			/* this is weak still, should be done delayed as well */
-			for (ob = bmain->object.first; ob; ob = ob->id.next) {
-				for (psys = ob->particlesystem.first; psys; psys = psys->next) {
-					if (&psys->part->id == id) {
-						ob->recalc |= (flag & OB_RECALC_ALL);
-						psys->recalc |= (flag & PSYS_RECALC);
-						lib_id_recalc_tag(bmain, &ob->id);
-						lib_id_recalc_data_tag(bmain, &ob->id);
-					}
-				}
-			}
-		}
-		else {
-			/* disable because this is called on various ID types automatically.
-			 * where printing warning is not useful. for now just ignore */
-			/* BLI_assert(!"invalid flag for this 'idtype'"); */
-		}
-	}
-	else if (GS(id->name) == ID_CF) {
-		for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
-			ModifierData *md = modifiers_findByType(ob, eModifierType_MeshSequenceCache);
-
-			if (md) {
-				MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *)md;
-
-				if (mcmd->cache_file && (&mcmd->cache_file->id == id)) {
-					ob->recalc |= OB_RECALC_ALL;
-					continue;
-				}
-			}
-
-			for (bConstraint *con = ob->constraints.first; con; con = con->next) {
-				if (con->type != CONSTRAINT_TYPE_TRANSFORM_CACHE) {
-					continue;
-				}
-
-				bTransformCacheConstraint *data = con->data;
-
-				if (data->cache_file && (&data->cache_file->id == id)) {
-					ob->recalc |= OB_RECALC_ALL;
-					break;
-				}
-			}
-		}
-	}
-}
-
-void DAG_id_tag_update(ID *id, short flag)
-{
-	DAG_id_tag_update_ex(G.main, id, flag);
-}
-
-void DAG_id_type_tag(Main *bmain, short idtype)
-{
-	if (idtype == ID_NT) {
-		/* stupid workaround so parent datablocks of nested nodetree get looped
-		 * over when we loop over tagged datablock types */
-		DAG_id_type_tag(bmain, ID_MA);
-		DAG_id_type_tag(bmain, ID_TE);
-		DAG_id_type_tag(bmain, ID_LA);
-		DAG_id_type_tag(bmain, ID_WO);
-		DAG_id_type_tag(bmain, ID_SCE);
-	}
-
-	bmain->id_tag_update[BKE_idcode_to_index(idtype)] = 1;
-}
-
-int DAG_id_type_tagged(Main *bmain, short idtype)
-{
-	return bmain->id_tag_update[BKE_idcode_to_index(idtype)];
-}
-
-#if 0 // UNUSED
-/* recursively descends tree, each node only checked once */
-/* node is checked to be of type object */
-static int parent_check_node(DagNode *node, int curtime)
-{
-	DagAdjList *itA;
-	
-	node->lasttime = curtime;
-	
-	if (node->color == DAG_GRAY)
-		return DAG_GRAY;
-	
-	for (itA = node->child; itA; itA = itA->next) {
-		if (itA->node->type == ID_OB) {
-			
-			if (itA->node->color == DAG_GRAY)
-				return DAG_GRAY;
-
-			/* descend if not done */
-			if (itA->node->lasttime != curtime) {
-				itA->node->color = parent_check_node(itA->node, curtime);
-			
-				if (itA->node->color == DAG_GRAY)
-					return DAG_GRAY;
-			}
-		}
-	}
-	
-	return DAG_WHITE;
-}
-#endif
-
-/* ******************* DAG FOR ARMATURE POSE ***************** */
-
-/* we assume its an armature with pose */
-void DAG_pose_sort(Object *ob)
-{
-	bPose *pose = ob->pose;
-	bPoseChannel *pchan;
-	bConstraint *con;
-	DagNode *node;
-	DagNode *node2, *node3;
-	DagNode *rootnode;
-	DagForest *dag;
-	DagNodeQueue *nqueue;
-	DagAdjList *itA;
-	ListBase tempbase;
-	int skip = 0;
-	
-	dag = dag_init();
-	dag->ugly_hack_sorry = false;  /* no ID structs */
-
-	rootnode = dag_add_node(dag, NULL);  /* node->ob becomes NULL */
-	
-	/* we add the hierarchy and the constraints */
-	for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
-		int addtoroot = 1;
-		
-		node = dag_get_node(dag, pchan);
-		
-		if (pchan->parent) {
-			node2 = dag_get_node(dag, pchan->parent);
-			dag_add_relation(dag, node2, node, 0, "Parent Relation");
-			addtoroot = 0;
-		}
-		for (con = pchan->constraints.first; con; con = con->next) {
-			const bConstraintTypeInfo *cti = BKE_constraint_typeinfo_get(con);
-			ListBase targets = {NULL, NULL};
-			bConstraintTarget *ct;
-			
-			if (cti && cti->get_constraint_targets) {
-				cti->get_constraint_targets(con, &targets);
-				
-				for (ct = targets.first; ct; ct = ct->next) {
-					if (ct->tar == ob && ct->subtarget[0]) {
-						bPoseChannel *target = BKE_pose_channel_find_name(ob->pose, ct->subtarget);
-						if (target) {
-							node2 = dag_get_node(dag, target);
-							dag_add_relation(dag, node2, node, 0, "Pose Constraint");
-							
-							if (con->type == CONSTRAINT_TYPE_KINEMATIC) {
-								bKinematicConstraint *data = (bKinematicConstraint *)con->data;
-								bPoseChannel *parchan;
-								int segcount = 0;
-								
-								/* exclude tip from chain? */
-								if (!(data->flag & CONSTRAINT_IK_TIP))
-									parchan = pchan->parent;
-								else
-									parchan = pchan;
-								
-								/* Walk to the chain's root */
-								while (parchan) {
-									node3 = dag_get_node(dag, parchan);
-									dag_add_relation(dag, node2, node3, 0, "IK Constraint");
-									
-									segcount++;
-									if (segcount == data->rootbone || segcount > 255) break;  /* 255 is weak */
-									parchan = parchan->parent;
-								}
-							}
-						}
-					}
-				}
-				
-				if (cti->flush_constraint_targets)
-					cti->flush_constraint_targets(con, &targets, 1);
-			}
-		}
-		if (addtoroot == 1) {
-			dag_add_relation(dag, rootnode, node, 0, "Root Bone Relation");
-		}
-	}
-
-	dag_check_cycle(dag);
-	
-	/* now we try to sort... */
-	BLI_listbase_clear(&tempbase);
-
-	nqueue = queue_create(DAGQUEUEALLOC);
-	
-	/* tag nodes unchecked */
-	for (node = dag->DagNode.first; node; node = node->next)
-		node->color = DAG_WHITE;
-	
-	rootnode->color = DAG_GRAY;
-	push_stack(nqueue, rootnode);  
-	
-	while (nqueue->count) {
-		
-		skip = 0;
-		node = get_top_node_queue(nqueue);
-		
-		itA = node->child;
-		while (itA != NULL) {
-			if (itA->node->color == DAG_WHITE) {
-				itA->node->color = DAG_GRAY;
-				push_stack(nqueue, itA->node);
-				skip = 1;
-				break;
-			}
-			itA = itA->next;
-		}
-		
-		if (!skip) {
-			if (node) {
-				node = pop_queue(nqueue);
-				if (node->ob == NULL)  /* we are done */
-					break;
-				node->color = DAG_BLACK;
-				
-				/* put node in new list */
-				BLI_remlink(&pose->chanbase, node->ob);
-				BLI_addhead(&tempbase, node->ob);
-			}
-		}
-	}
-	
-	/* temporal correction for circular dependencies */
-	while (pose->chanbase.first) {
-		pchan = pose->chanbase.first;
-		BLI_remlink(&pose->chanbase, pchan);
-		BLI_addhead(&tempbase, pchan);
-
-		printf("cyclic %s\n", pchan->name);
-	}
-	
-	pose->chanbase = tempbase;
-	queue_delete(nqueue);
-	
-//	printf("\nordered\n");
-//	for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
-//		printf(" %s\n", pchan->name);
-//	}
-	
-	free_forest(dag);
-	MEM_freeN(dag);
-}
-
-/* ************************  DAG FOR THREADED UPDATE  ********************* */
-
-/* Initialize run-time data in the graph needed for traversing it
- * from multiple threads and start threaded tree traversal by adding
- * the root node to the queue.
- *
- * This will mark DAG nodes as object/non-object and will calculate
- * num_pending_parents of nodes (which is how many non-updated parents node
- * have, which helps a lot checking whether node could be scheduled
- * already or not).
- */
-void DAG_threaded_update_begin(Scene *scene,
-                               void (*func)(void *node, void *user_data),
-                               void *user_data)
-{
-	DagNode *node;
-
-	/* We reset num_pending_parents to zero first and tag node as not scheduled yet... */
-	for (node = scene->theDag->DagNode.first; node; node = node->next) {
-		node->num_pending_parents = 0;
-		node->scheduled = false;
-	}
-
-	/* ... and then iterate over all the nodes and
-	 * increase num_pending_parents for node childs.
-	 */
-	for (node = scene->theDag->DagNode.first; node; node = node->next) {
-		DagAdjList *itA;
-
-		for (itA = node->child; itA; itA = itA->next) {
-			if (itA->node != node) {
-				itA->node->num_pending_parents++;
-			}
-		}
-	}
-
-	/* Add root nodes to the queue. */
-	BLI_spin_lock(&threaded_update_lock);
-	for (node = scene->theDag->DagNode.first; node; node = node->next) {
-		if (node->num_pending_parents == 0) {
-			node->scheduled = true;
-			func(node, user_data);
-		}
-	}
-	BLI_spin_unlock(&threaded_update_lock);
-}
-
-/* This function is called when handling node is done.
- *
- * This function updates num_pending_parents for all childs and
- * schedules them if they're ready.
- */
-void DAG_threaded_update_handle_node_updated(void *node_v,
-                                             void (*func)(void *node, void *user_data),
-                                             void *user_data)
-{
-	DagNode *node = node_v;
-	DagAdjList *itA;
-
-	for (itA = node->child; itA; itA = itA->next) {
-		DagNode *child_node = itA->node;
-		if (child_node != node) {
-			atomic_sub_and_fetch_uint32(&child_node->num_pending_parents, 1);
-
-			if (child_node->num_pending_parents == 0) {
-				bool need_schedule;
-
-				BLI_spin_lock(&threaded_update_lock);
-				need_schedule = child_node->scheduled == false;
-				child_node->scheduled = true;
-				BLI_spin_unlock(&threaded_update_lock);
-
-				if (need_schedule) {
-					func(child_node, user_data);
-				}
-			}
-		}
-	}
-}
-
-/* ************************ DAG DEBUGGING ********************* */
-
-void DAG_print_dependencies(Main *bmain, Scene *scene, Object *ob)
-{
-	/* utility for debugging dependencies */
-	dag_print_dependencies = 1;
-
-	if (ob && (ob->mode & OB_MODE_POSE)) {
-		printf("\nDEPENDENCY RELATIONS for %s\n\n", ob->id.name + 2);
-		DAG_pose_sort(ob);
-	}
-	else {
-		printf("\nDEPENDENCY RELATIONS for %s\n\n", scene->id.name + 2);
-		DAG_scene_relations_rebuild(bmain, scene);
-	}
-	
-	dag_print_dependencies = 0;
-}
-
-/* ************************ DAG querying ********************* */
-
-/* Will return Object ID if node represents Object,
- * and will return NULL otherwise.
- */
-Object *DAG_get_node_object(void *node_v)
-{
-	DagNode *node = node_v;
-
-	if (node->type == ID_OB) {
-		return node->ob;
-	}
-
-	return NULL;
-}
-
-/* Returns node name, used for debug output only, atm. */
-const char *DAG_get_node_name(Scene *scene, void *node_v)
-{
-	DagNode *node = node_v;
-
-	return dag_node_name(scene->theDag, node);
-}
-
-short DAG_get_eval_flags_for_object(Scene *scene, void *object)
-{
-	DagNode *node;
-
-	if (!DEG_depsgraph_use_legacy()) {
-		return DEG_get_eval_flags_for_id(scene->depsgraph, (ID *)object);
-	}
-
-	if (scene->theDag == NULL) {
-		/* Happens when converting objects to mesh from a python script
-		 * after modifying scene graph.
-		 *
-		 * Currently harmless because it's only called for temporary
-		 * objects which are out of the DAG anyway.
-		 */
-		return 0;
-	}
-
-	node = dag_find_node(scene->theDag, object);
-
-	if (node) {
-		return node->eval_flags;
-	}
-	else {
-		/* Happens when external render engine exports temporary objects
-		 * which are not in the DAG.
-		 */
-
-		/* TODO(sergey): Doublecheck objects with Curve Deform exports all fine. */
-
-		/* TODO(sergey): Weak but currently we can't really access proper DAG from
-		 * the modifiers stack. This is because in most cases modifier is to use
-		 * the foreground scene, but to access evaluation flags we need to know
-		 * active background scene, which we don't know.
-		 */
-		if (scene->set) {
-			return DAG_get_eval_flags_for_object(scene->set, object);
-		}
-		return 0;
-	}
-}
-
-bool DAG_is_acyclic(Scene *scene)
-{
-	return scene->theDag->is_acyclic;
-}
-
-#else
-
 /* *********************************************************************
  * Stubs to avoid linking issues and make sure legacy crap is not used *
  * *********************************************************************
@@ -3686,5 +338,3 @@ void DAG_print_dependencies(Main *UNUSED(bmain),
 {
 	DEG_debug_graphviz(scene->depsgraph, stdout, "Depsgraph", false);
 }
-
-#endif
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index af02e02b017..134173580ae 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -48,6 +48,7 @@
 #include "BKE_DerivedMesh.h"
 #include "BKE_global.h"
 #include "BKE_mesh.h"
+#include "BKE_mesh_render.h"
 #include "BKE_displist.h"
 #include "BKE_library.h"
 #include "BKE_library_query.h"
@@ -435,6 +436,8 @@ void BKE_mesh_free(Mesh *me)
 {
 	BKE_animdata_free(&me->id, false);
 
+	BKE_mesh_batch_cache_free(me);
+
 	CustomData_free(&me->vdata, me->totvert);
 	CustomData_free(&me->edata, me->totedge);
 	CustomData_free(&me->fdata, me->totface);
@@ -522,6 +525,7 @@ Mesh *BKE_mesh_copy(Main *bmain, Mesh *me)
 	BKE_mesh_update_customdata_pointers(men, do_tessface);
 
 	men->edit_btmesh = NULL;
+	men->batch_cache = NULL;
 
 	men->mselect = MEM_dupallocN(men->mselect);
 	men->bb = MEM_dupallocN(men->bb);
diff --git a/source/blender/blenkernel/intern/mesh_render.c b/source/blender/blenkernel/intern/mesh_render.c
new file mode 100644
index 00000000000..f90783a3dbb
--- /dev/null
+++ b/source/blender/blenkernel/intern/mesh_render.c
@@ -0,0 +1,619 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2017 by Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation, Mike Erwin, Dalai Felinto
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/blenkernel/intern/mesh_render.c
+ *  \ingroup bke
+ *
+ * \brief Mesh API for render engines
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+
+#include "BKE_customdata.h"
+#include "BKE_depsgraph.h"
+#include "BKE_DerivedMesh.h"
+#include "BKE_editmesh.h"
+#include "BKE_mesh.h"
+#include "BKE_mesh_render.h"
+
+#include "GPU_batch.h"
+
+/* ---------------------------------------------------------------------- */
+/* Mesh Interface */
+
+#define MESH_RENDER_FUNCTION(func_name)     \
+	if (me->edit_btmesh) {                  \
+	    return mesh_bmesh_##func_name(me);  \
+	}                                       \
+	else {                                  \
+	    return mesh_struct_##func_name(me); \
+	}
+
+
+/* Mesh Implementation */
+
+static int mesh_struct_get_num_edges(Mesh *me)
+{
+	return me->totedge;
+}
+
+static int mesh_struct_get_num_verts(Mesh *me)
+{
+	return me->totvert;
+}
+
+static int mesh_struct_get_num_faces(Mesh *me)
+{
+	BKE_mesh_tessface_ensure(me);
+	return me->totface;
+}
+
+static int mesh_struct_get_num_polys(Mesh *me)
+{
+	return me->totpoly;
+}
+
+static MEdge *mesh_struct_get_array_edge(Mesh *me)
+{
+	return CustomData_get_layer(&me->edata, CD_MEDGE);
+}
+
+static MFace *mesh_struct_get_array_face(Mesh *me)
+{
+	BKE_mesh_tessface_ensure(me);
+	return CustomData_get_layer(&me->fdata, CD_MFACE);
+}
+
+static MLoop *mesh_struct_get_array_loop(Mesh *me)
+{
+	return me->mloop;
+}
+
+static MPoly *mesh_struct_get_array_poly(Mesh *me)
+{
+	return me->mpoly;
+}
+
+static MVert *mesh_struct_get_array_vert(Mesh *me)
+{
+	return CustomData_get_layer(&me->vdata, CD_MVERT);
+}
+
+/* BMesh Implementation */
+
+/* NOTE: we may want to get rid of Derived Mesh and
+ * access BMesh directly */
+
+static int mesh_bmesh_get_num_verts(Mesh *me)
+{
+	BMEditMesh *bm = me->edit_btmesh;
+	DerivedMesh *dm = bm->derivedFinal;
+	return dm->getNumVerts(dm);
+}
+
+static int mesh_bmesh_get_num_edges(Mesh *me)
+{
+	BMEditMesh *bm = me->edit_btmesh;
+	DerivedMesh *dm = bm->derivedFinal;
+	return dm->getNumEdges(dm);
+}
+
+static int mesh_bmesh_get_num_faces(Mesh *me)
+{
+	BMEditMesh *bm = me->edit_btmesh;
+	DerivedMesh *dm = bm->derivedFinal;
+	return dm->getNumTessFaces(dm);
+}
+
+static int mesh_bmesh_get_num_polys(Mesh *me)
+{
+	BMEditMesh *bm = me->edit_btmesh;
+	DerivedMesh *dm = bm->derivedFinal;
+	return dm->getNumPolys(dm);
+}
+
+static MEdge *mesh_bmesh_get_array_edge(Mesh *me)
+{
+	BMEditMesh *bm = me->edit_btmesh;
+	DerivedMesh *dm = bm->derivedFinal;
+	return dm->getEdgeArray(dm);
+}
+
+static MFace *mesh_bmesh_get_array_face(Mesh *me)
+{
+	BMEditMesh *bm = me->edit_btmesh;
+	DerivedMesh *dm = bm->derivedFinal;
+	return dm->getTessFaceArray(dm);
+}
+
+static MLoop *mesh_bmesh_get_array_loop(Mesh *me)
+{
+	BMEditMesh *bm = me->edit_btmesh;
+	DerivedMesh *dm = bm->derivedFinal;
+	return dm->getLoopArray(dm);
+}
+
+static MPoly *mesh_bmesh_get_array_poly(Mesh *me)
+{
+	BMEditMesh *bm = me->edit_btmesh;
+	DerivedMesh *dm = bm->derivedFinal;
+	return dm->getPolyArray(dm);
+}
+
+static MVert *mesh_bmesh_get_array_vert(Mesh *me)
+{
+	BMEditMesh *bm = me->edit_btmesh;
+	DerivedMesh *dm = bm->derivedFinal;
+	return dm->getVertArray(dm);
+}
+
+/* Mesh API */
+
+static int mesh_render_get_num_edges(Mesh *me)
+{
+	MESH_RENDER_FUNCTION(get_num_edges);
+}
+
+static int mesh_render_get_num_faces(Mesh *me)
+{
+	MESH_RENDER_FUNCTION(get_num_faces);
+}
+
+static int mesh_render_get_num_polys(Mesh *me)
+{
+	MESH_RENDER_FUNCTION(get_num_polys);
+}
+
+static int mesh_render_get_num_verts(Mesh *me)
+{
+	MESH_RENDER_FUNCTION(get_num_verts);
+}
+
+static MEdge *mesh_render_get_array_edge(Mesh *me)
+{
+	MESH_RENDER_FUNCTION(get_array_edge);
+}
+
+static MFace *mesh_render_get_array_face(Mesh *me)
+{
+	MESH_RENDER_FUNCTION(get_array_face);
+}
+
+static MLoop *mesh_render_get_array_loop(Mesh *me)
+{
+	MESH_RENDER_FUNCTION(get_array_loop);
+}
+
+static MPoly *mesh_render_get_array_poly(Mesh *me)
+{
+	MESH_RENDER_FUNCTION(get_array_poly);
+}
+
+static MVert *mesh_render_get_array_vert(Mesh *me)
+{
+	MESH_RENDER_FUNCTION(get_array_vert);
+}
+
+/* ---------------------------------------------------------------------- */
+/* Mesh Batch Cache */
+
+typedef struct MeshBatchCache {
+	VertexBuffer *pos_in_order;
+	ElementList *edges_in_order;
+	ElementList *triangles_in_order;
+
+	Batch *all_verts;
+	Batch *all_edges;
+	Batch *all_triangles;
+
+	Batch *fancy_edges; /* owns its vertex buffer (not shared) */
+	Batch *overlay_edges; /* owns its vertex buffer */
+
+	/* TODO: settings, before DEPSGRAPH update */
+	int tot_edges;
+	int tot_faces;
+	int tot_polys;
+	int tot_verts;
+	bool is_editmode;
+} MeshBatchCache;
+
+static bool mesh_batch_cache_valid(Mesh *me)
+{
+	MeshBatchCache *cache = me->batch_cache;
+
+	if (cache == NULL) {
+		return false;
+	}
+
+	if (cache->is_editmode != (me->edit_btmesh != NULL)) {
+		return false;
+	}
+
+	if (cache->is_editmode) {
+		DerivedMesh *dm = me->edit_btmesh->derivedFinal;
+		if ((dm->dirty & DM_MESH_BATCH_CACHE) == 0) {
+			return false;
+		}
+	}
+
+	/* TODO: temporary check, waiting for depsgraph update */
+	if ((cache->tot_edges != mesh_render_get_num_edges(me)) ||
+	    (cache->tot_faces != mesh_render_get_num_faces(me)) ||
+	    (cache->tot_polys != mesh_render_get_num_polys(me)) ||
+	    (cache->tot_verts != mesh_render_get_num_verts(me)))
+	{
+		return false;
+	}
+
+	return true;
+}
+
+static void mesh_batch_cache_init(Mesh *me)
+{
+	MeshBatchCache *cache = me->batch_cache;
+	cache->is_editmode = me->edit_btmesh != NULL;
+
+	cache->tot_edges = mesh_render_get_num_edges(me);
+	cache->tot_faces = mesh_render_get_num_faces(me);
+	cache->tot_polys = mesh_render_get_num_polys(me);
+	cache->tot_verts = mesh_render_get_num_verts(me);
+
+	if (cache->is_editmode) {
+		DerivedMesh *dm = me->edit_btmesh->derivedFinal;
+		dm->dirty |= DM_MESH_BATCH_CACHE;
+	}
+}
+
+static MeshBatchCache *mesh_batch_cache_get(Mesh *me)
+{
+	if (!mesh_batch_cache_valid(me)) {
+		BKE_mesh_batch_cache_free(me);
+		me->batch_cache = MEM_callocN(sizeof(MeshBatchCache), "MeshBatchCache");
+		mesh_batch_cache_init(me);
+	}
+	return me->batch_cache;
+}
+
+static VertexBuffer *mesh_batch_cache_get_pos_in_order(Mesh *me)
+{
+	MeshBatchCache *cache = mesh_batch_cache_get(me);
+
+	if (cache->pos_in_order == NULL) {
+		static VertexFormat format = { 0 };
+		static unsigned pos_id;
+		if (format.attrib_ct == 0) {
+			/* initialize vertex format */
+			pos_id = add_attrib(&format, "pos", GL_FLOAT, 3, KEEP_FLOAT);
+		}
+
+		const int vertex_ct = mesh_render_get_num_verts(me);
+		const MVert *verts = mesh_render_get_array_vert(me);
+
+		cache->pos_in_order = VertexBuffer_create_with_format(&format);
+		VertexBuffer_allocate_data(cache->pos_in_order, vertex_ct);
+#if 0
+		const unsigned stride = (verts + 1) - verts; /* or sizeof(MVert) */
+		fillAttribStride(cache->pos_in_order, pos_id, stride, &verts[0].co);
+#else
+		for (int i = 0; i < vertex_ct; ++i) {
+			setAttrib(cache->pos_in_order, pos_id, i, &verts[i].co);
+		}
+#endif
+	}
+
+	return cache->pos_in_order;
+}
+
+static ElementList *mesh_batch_cache_get_edges_in_order(Mesh *me)
+{
+	MeshBatchCache *cache = mesh_batch_cache_get(me);
+
+	if (cache->edges_in_order == NULL) {
+		const int vertex_ct = mesh_render_get_num_verts(me);
+		const int edge_ct = mesh_render_get_num_edges(me);
+		const MEdge *edges = mesh_render_get_array_edge(me);
+
+		ElementListBuilder elb;
+		ElementListBuilder_init(&elb, GL_LINES, edge_ct, vertex_ct);
+		for (int i = 0; i < edge_ct; ++i) {
+			const MEdge *edge = edges + i;
+			add_line_vertices(&elb, edge->v1, edge->v2);
+		}
+		cache->edges_in_order = ElementList_build(&elb);
+	}
+
+	return cache->edges_in_order;
+}
+
+static ElementList *mesh_batch_cache_get_triangles_in_order(Mesh *me)
+{
+	MeshBatchCache *cache = mesh_batch_cache_get(me);
+
+	if (cache->triangles_in_order == NULL) {
+		const int vertex_ct = mesh_render_get_num_verts(me);
+		const int tessface_ct = mesh_render_get_num_faces(me);
+		MFace *tessfaces = mesh_render_get_array_face(me);
+
+		ElementListBuilder elb;
+		ElementListBuilder_init(&elb, GL_TRIANGLES, tessface_ct * 2, vertex_ct); /* up to 2 triangles per tessface */
+		for (int i = 0; i < tessface_ct; ++i) {
+			const MFace *tess = tessfaces + i;
+			add_triangle_vertices(&elb, tess->v1, tess->v2, tess->v3);
+
+			if (tess->v4) {
+				add_triangle_vertices(&elb, tess->v1, tess->v3, tess->v4);
+			}
+		}
+		cache->triangles_in_order = ElementList_build(&elb);
+	}
+
+	/* NOTE: we are reallocating, it would be interesting to reallocating the memory once we
+	 * know the exactly triangle count (like in BKE_mesh_batch_cache_get_overlay_edges) */
+
+	return cache->triangles_in_order;
+}
+
+void BKE_mesh_batch_cache_free(Mesh *me)
+{
+	MeshBatchCache *cache = me->batch_cache;
+	if (!cache) {
+		return;
+	}
+
+	if (cache->all_verts) Batch_discard(cache->all_verts);
+	if (cache->all_edges) Batch_discard(cache->all_edges);
+	if (cache->all_triangles) Batch_discard(cache->all_triangles);
+
+	if (cache->pos_in_order) VertexBuffer_discard(cache->pos_in_order);
+	if (cache->edges_in_order) ElementList_discard(cache->edges_in_order);
+	if (cache->triangles_in_order) ElementList_discard(cache->triangles_in_order);
+
+	if (cache->fancy_edges) {
+		Batch_discard_all(cache->fancy_edges);
+	}
+
+	if (cache->overlay_edges) {
+		Batch_discard_all(cache->overlay_edges);
+	}
+
+	MEM_freeN(cache);
+	me->batch_cache = NULL;
+}
+
+Batch *BKE_mesh_batch_cache_get_all_edges(Mesh *me)
+{
+	MeshBatchCache *cache = mesh_batch_cache_get(me);
+
+	if (cache->all_edges == NULL) {
+		/* create batch from Mesh */
+		cache->all_edges = Batch_create(GL_LINES, mesh_batch_cache_get_pos_in_order(me), mesh_batch_cache_get_edges_in_order(me));
+	}
+
+	return cache->all_edges;
+}
+
+Batch *BKE_mesh_batch_cache_get_all_triangles(Mesh *me)
+{
+	MeshBatchCache *cache = mesh_batch_cache_get(me);
+
+	if (cache->all_triangles == NULL) {
+		/* create batch from DM */
+		cache->all_triangles = Batch_create(GL_TRIANGLES, mesh_batch_cache_get_pos_in_order(me), mesh_batch_cache_get_triangles_in_order(me));
+	}
+
+	return cache->all_triangles;
+}
+
+Batch *BKE_mesh_batch_cache_get_all_verts(Mesh *me)
+{
+	MeshBatchCache *cache = mesh_batch_cache_get(me);
+
+	if (cache->all_verts == NULL) {
+		/* create batch from DM */
+		cache->all_verts = Batch_create(GL_POINTS, mesh_batch_cache_get_pos_in_order(me), NULL);
+		Batch_set_builtin_program(cache->all_verts, GPU_SHADER_3D_POINT_FIXED_SIZE_UNIFORM_COLOR);
+	}
+
+	return cache->all_verts;
+}
+
+Batch *BKE_mesh_batch_cache_get_fancy_edges(Mesh *me)
+{
+	MeshBatchCache *cache = mesh_batch_cache_get(me);
+
+	if (cache->fancy_edges == NULL) {
+		/* create batch from DM */
+		static VertexFormat format = { 0 };
+		static unsigned pos_id, n1_id, n2_id;
+		if (format.attrib_ct == 0) {
+			/* initialize vertex format */
+			pos_id = add_attrib(&format, "pos", COMP_F32, 3, KEEP_FLOAT);
+
+#if USE_10_10_10 /* takes 1/3 the space */
+			n1_id = add_attrib(&format, "N1", COMP_I10, 3, NORMALIZE_INT_TO_FLOAT);
+			n2_id = add_attrib(&format, "N2", COMP_I10, 3, NORMALIZE_INT_TO_FLOAT);
+#else
+			n1_id = add_attrib(&format, "N1", COMP_F32, 3, KEEP_FLOAT);
+			n2_id = add_attrib(&format, "N2", COMP_F32, 3, KEEP_FLOAT);
+#endif
+		}
+		VertexBuffer *vbo = VertexBuffer_create_with_format(&format);
+
+		const MVert *verts = mesh_render_get_array_vert(me);
+		const MEdge *edges = mesh_render_get_array_edge(me);
+		const MPoly *polys = mesh_render_get_array_poly(me);
+		const MLoop *loops = mesh_render_get_array_loop(me);
+		const int edge_ct = mesh_render_get_num_edges(me);
+		const int poly_ct = mesh_render_get_num_polys(me);
+
+		/* need normal of each face, and which faces are adjacent to each edge */
+		typedef struct {
+			int count;
+			int face_index[2];
+		} AdjacentFaces;
+
+		float (*face_normal)[3] = MEM_mallocN(poly_ct * 3 * sizeof(float), "face_normal");
+		AdjacentFaces *adj_faces = MEM_callocN(edge_ct * sizeof(AdjacentFaces), "adj_faces");
+
+		for (int i = 0; i < poly_ct; ++i) {
+			const MPoly *poly = polys + i;
+
+			BKE_mesh_calc_poly_normal(poly, loops + poly->loopstart, verts, face_normal[i]);
+
+			for (int j = poly->loopstart; j < (poly->loopstart + poly->totloop); ++j) {
+				AdjacentFaces *adj = adj_faces + loops[j].e;
+				if (adj->count < 2)
+					adj->face_index[adj->count] = i;
+				adj->count++;
+			}
+		}
+
+		const int vertex_ct = edge_ct * 2; /* these are GL_LINE verts, not mesh verts */
+		VertexBuffer_allocate_data(vbo, vertex_ct);
+		for (int i = 0; i < edge_ct; ++i) {
+			const MEdge *edge = edges + i;
+			const AdjacentFaces *adj = adj_faces + i;
+
+#if USE_10_10_10
+			PackedNormal n1value = { .x = 0, .y = 0, .z = +511 };
+			PackedNormal n2value = { .x = 0, .y = 0, .z = -511 };
+
+			if (adj->count == 2) {
+				n1value = convert_i10_v3(face_normal[adj->face_index[0]]);
+				n2value = convert_i10_v3(face_normal[adj->face_index[1]]);
+			}
+
+			const PackedNormal *n1 = &n1value;
+			const PackedNormal *n2 = &n2value;
+#else
+			const float dummy1[3] = { 0.0f, 0.0f, +1.0f };
+			const float dummy2[3] = { 0.0f, 0.0f, -1.0f };
+
+			const float *n1 = (adj->count == 2) ? face_normal[adj->face_index[0]] : dummy1;
+			const float *n2 = (adj->count == 2) ? face_normal[adj->face_index[1]] : dummy2;
+#endif
+
+			setAttrib(vbo, pos_id, 2 * i, &verts[edge->v1].co);
+			setAttrib(vbo, n1_id, 2 * i, n1);
+			setAttrib(vbo, n2_id, 2 * i, n2);
+
+			setAttrib(vbo, pos_id, 2 * i + 1, &verts[edge->v2].co);
+			setAttrib(vbo, n1_id, 2 * i + 1, n1);
+			setAttrib(vbo, n2_id, 2 * i + 1, n2);
+		}
+
+		MEM_freeN(adj_faces);
+		MEM_freeN(face_normal);
+
+		cache->fancy_edges = Batch_create(GL_LINES, vbo, NULL);
+	}
+
+	return cache->fancy_edges;
+}
+
+static bool edge_is_real(const MEdge *edges, int edge_ct, int v1, int v2)
+{
+	/* TODO: same thing, except not ridiculously slow */
+
+	for (int e = 0; e < edge_ct; ++e) {
+		const MEdge *edge = edges + e;
+		if ((edge->v1 == v1 && edge->v2 == v2) || (edge->v1 == v2 && edge->v2 == v1)) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+static void add_overlay_tri(
+        VertexBuffer *vbo, unsigned pos_id, unsigned edgeMod_id, const MVert *verts,
+        const MEdge *edges, int edge_ct, int v1, int v2, int v3, int base_vert_idx)
+{
+	const float edgeMods[2] = { 0.0f, 1.0f };
+
+	const float *pos = verts[v1].co;
+	setAttrib(vbo, pos_id, base_vert_idx + 0, pos);
+	setAttrib(vbo, edgeMod_id, base_vert_idx + 0, edgeMods + (edge_is_real(edges, edge_ct, v2, v3) ? 1 : 0));
+
+	pos = verts[v2].co;
+	setAttrib(vbo, pos_id, base_vert_idx + 1, pos);
+	setAttrib(vbo, edgeMod_id, base_vert_idx + 1, edgeMods + (edge_is_real(edges, edge_ct, v3, v1) ? 1 : 0));
+
+	pos = verts[v3].co;
+	setAttrib(vbo, pos_id, base_vert_idx + 2, pos);
+	setAttrib(vbo, edgeMod_id, base_vert_idx + 2, edgeMods + (edge_is_real(edges, edge_ct, v1, v2) ? 1 : 0));
+}
+
+Batch *BKE_mesh_batch_cache_get_overlay_edges(Mesh *me)
+{
+	MeshBatchCache *cache = mesh_batch_cache_get(me);
+
+	if (cache->overlay_edges == NULL) {
+		/* create batch from DM */
+		static VertexFormat format = { 0 };
+		static unsigned pos_id, edgeMod_id;
+
+		if (format.attrib_ct == 0) {
+			/* initialize vertex format */
+			pos_id = add_attrib(&format, "pos", GL_FLOAT, 3, KEEP_FLOAT);
+			edgeMod_id = add_attrib(&format, "edgeWidthModulator", GL_FLOAT, 1, KEEP_FLOAT);
+		}
+		VertexBuffer *vbo = VertexBuffer_create_with_format(&format);
+
+		const int edge_ct = mesh_render_get_num_edges(me);
+		const int tessface_ct = mesh_render_get_num_faces(me);
+		const MVert *verts = mesh_render_get_array_vert(me);
+		const MEdge *edges = mesh_render_get_array_edge(me);
+		const MFace *tessfaces = mesh_render_get_array_face(me);
+
+		VertexBuffer_allocate_data(vbo, tessface_ct * 6); /* up to 2 triangles per tessface */
+
+		int gpu_vert_idx = 0;
+		for (int i = 0; i < tessface_ct; ++i) {
+			const MFace *tess = tessfaces + i;
+			add_overlay_tri(vbo, pos_id, edgeMod_id, verts, edges, edge_ct, tess->v1, tess->v2, tess->v3, gpu_vert_idx);
+			gpu_vert_idx += 3;
+			/* tessface can be triangle or quad */
+			if (tess->v4) {
+				add_overlay_tri(vbo, pos_id, edgeMod_id, verts, edges, edge_ct, tess->v3, tess->v2, tess->v4, gpu_vert_idx);
+				gpu_vert_idx += 3;
+			}
+		}
+
+		/* in some cases all the faces are quad, so no need to reallocate */
+		if (vbo->vertex_ct != gpu_vert_idx) {
+			VertexBuffer_resize_data(vbo, gpu_vert_idx);
+		}
+
+		cache->overlay_edges = Batch_create(GL_TRIANGLES, vbo, NULL);
+	}
+
+	return cache->overlay_edges;
+}
+
+#undef MESH_RENDER_FUNCTION
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 5cb704e4737..047de18d5b5 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -60,11 +60,7 @@
 
 #include "DEG_depsgraph.h"
 
-#ifdef WITH_LEGACY_DEPSGRAPH
-#  define DEBUG_PRINT if (!DEG_depsgraph_use_legacy() && G.debug & G_DEBUG_DEPSGRAPH) printf
-#else
-#  define DEBUG_PRINT if (G.debug & G_DEBUG_DEPSGRAPH) printf
-#endif
+#define DEBUG_PRINT if (G.debug & G_DEBUG_DEPSGRAPH) printf
 
 static ThreadMutex material_lock = BLI_MUTEX_INITIALIZER;
 
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 8887ff538fa..54eaf29980d 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1348,109 +1348,6 @@ void BKE_scene_frame_set(struct Scene *scene, double cfra)
 	scene->r.cfra = (int)intpart;
 }
 
-#ifdef WITH_LEGACY_DEPSGRAPH
-/* drivers support/hacks 
- *  - this method is called from scene_update_tagged_recursive(), so gets included in viewport + render
- *	- these are always run since the depsgraph can't handle non-object data
- *	- these happen after objects are all done so that we can read in their final transform values,
- *	  though this means that objects can't refer to scene info for guidance...
- */
-static void scene_update_drivers(Main *UNUSED(bmain), Scene *scene)
-{
-	SceneRenderLayer *srl;
-	float ctime = BKE_scene_frame_get(scene);
-	
-	/* scene itself */
-	if (scene->adt && scene->adt->drivers.first) {
-		BKE_animsys_evaluate_animdata(scene, &scene->id, scene->adt, ctime, ADT_RECALC_DRIVERS);
-	}
-
-	/* world */
-	/* TODO: what about world textures? but then those have nodes too... */
-	if (scene->world) {
-		ID *wid = (ID *)scene->world;
-		AnimData *adt = BKE_animdata_from_id(wid);
-		
-		if (adt && adt->drivers.first)
-			BKE_animsys_evaluate_animdata(scene, wid, adt, ctime, ADT_RECALC_DRIVERS);
-	}
-	
-	/* nodes */
-	if (scene->nodetree) {
-		ID *nid = (ID *)scene->nodetree;
-		AnimData *adt = BKE_animdata_from_id(nid);
-		
-		if (adt && adt->drivers.first)
-			BKE_animsys_evaluate_animdata(scene, nid, adt, ctime, ADT_RECALC_DRIVERS);
-	}
-
-	/* world nodes */
-	if (scene->world && scene->world->nodetree) {
-		ID *nid = (ID *)scene->world->nodetree;
-		AnimData *adt = BKE_animdata_from_id(nid);
-		
-		if (adt && adt->drivers.first)
-			BKE_animsys_evaluate_animdata(scene, nid, adt, ctime, ADT_RECALC_DRIVERS);
-	}
-
-	/* freestyle */
-	for (srl = scene->r.layers.first; srl; srl = srl->next) {
-		FreestyleConfig *config = &srl->freestyleConfig;
-		FreestyleLineSet *lineset;
-
-		for (lineset = config->linesets.first; lineset; lineset = lineset->next) {
-			if (lineset->linestyle) {
-				ID *lid = &lineset->linestyle->id;
-				AnimData *adt = BKE_animdata_from_id(lid);
-
-				if (adt && adt->drivers.first)
-					BKE_animsys_evaluate_animdata(scene, lid, adt, ctime, ADT_RECALC_DRIVERS);
-			}
-		}
-	}
-}
-
-/* deps hack - do extra recalcs at end */
-static void scene_depsgraph_hack(EvaluationContext *eval_ctx, Scene *scene, Scene *scene_parent)
-{
-	Base *base;
-		
-	scene->customdata_mask = scene_parent->customdata_mask;
-	
-	/* sets first, we allow per definition current scene to have
-	 * dependencies on sets, but not the other way around. */
-	if (scene->set)
-		scene_depsgraph_hack(eval_ctx, scene->set, scene_parent);
-	
-	for (base = scene->base.first; base; base = base->next) {
-		Object *ob = base->object;
-		
-		if (ob->depsflag) {
-			int recalc = 0;
-			// printf("depshack %s\n", ob->id.name + 2);
-			
-			if (ob->depsflag & OB_DEPS_EXTRA_OB_RECALC)
-				recalc |= OB_RECALC_OB;
-			if (ob->depsflag & OB_DEPS_EXTRA_DATA_RECALC)
-				recalc |= OB_RECALC_DATA;
-			
-			ob->recalc |= recalc;
-			BKE_object_handle_update(eval_ctx, scene_parent, ob);
-			
-			if (ob->dup_group && (ob->transflag & OB_DUPLIGROUP)) {
-				GroupObject *go;
-				
-				for (go = ob->dup_group->gobject.first; go; go = go->next) {
-					if (go->ob)
-						go->ob->recalc |= recalc;
-				}
-				BKE_group_handle_recalc_and_update(eval_ctx, scene_parent, ob, ob->dup_group);
-			}
-		}
-	}
-}
-#endif  /* WITH_LEGACY_DEPSGRAPH */
-
 /* That's like really a bummer, because currently animation data for armatures
  * might want to use pose, and pose might be missing on the object.
  * This happens when changing visible layers, which leads to situations when
@@ -1479,350 +1376,6 @@ static void scene_armature_depsgraph_workaround(Main *bmain)
 }
 #endif
 
-#ifdef WITH_LEGACY_DEPSGRAPH
-static void scene_rebuild_rbw_recursive(Scene *scene, float ctime)
-{
-	if (scene->set)
-		scene_rebuild_rbw_recursive(scene->set, ctime);
-
-	if (BKE_scene_check_rigidbody_active(scene))
-		BKE_rigidbody_rebuild_world(scene, ctime);
-}
-
-static void scene_do_rb_simulation_recursive(Scene *scene, float ctime)
-{
-	if (scene->set)
-		scene_do_rb_simulation_recursive(scene->set, ctime);
-
-	if (BKE_scene_check_rigidbody_active(scene))
-		BKE_rigidbody_do_simulation(scene, ctime);
-}
-#endif
-
-/* Used to visualize CPU threads activity during threaded object update,
- * would pollute STDERR with whole bunch of timing information which then
- * could be parsed and nicely visualized.
- */
-#ifdef WITH_LEGACY_DEPSGRAPH
-#  undef DETAILED_ANALYSIS_OUTPUT
-#else
-/* ALWAYS KEEY DISABLED! */
-#  undef DETAILED_ANALYSIS_OUTPUT
-#endif
-
-/* Mballs evaluation uses BKE_scene_base_iter_next which calls
- * duplilist for all objects in the scene. This leads to conflict
- * accessing and writing same data from multiple threads.
- *
- * Ideally Mballs shouldn't do such an iteration and use DAG
- * queries instead. For the time being we've got new DAG
- * let's keep it simple and update mballs in a single thread.
- */
-#define MBALL_SINGLETHREAD_HACK
-
-#ifdef WITH_LEGACY_DEPSGRAPH
-typedef struct StatisicsEntry {
-	struct StatisicsEntry *next, *prev;
-	Object *object;
-	double start_time;
-	double duration;
-} StatisicsEntry;
-
-typedef struct ThreadedObjectUpdateState {
-	/* TODO(sergey): We might want this to be per-thread object. */
-	EvaluationContext *eval_ctx;
-	Scene *scene;
-	Scene *scene_parent;
-	double base_time;
-
-#ifdef MBALL_SINGLETHREAD_HACK
-	bool has_mballs;
-#endif
-
-	/* Execution statistics */
-	bool has_updated_objects;
-	ListBase *statistics;
-} ThreadedObjectUpdateState;
-
-static void scene_update_object_add_task(void *node, void *user_data);
-
-static void scene_update_all_bases(EvaluationContext *eval_ctx, Scene *scene, Scene *scene_parent)
-{
-	Base *base;
-
-	for (base = scene->base.first; base; base = base->next) {
-		Object *object = base->object;
-
-		BKE_object_handle_update_ex(eval_ctx, scene_parent, object, scene->rigidbody_world, true);
-
-		if (object->dup_group && (object->transflag & OB_DUPLIGROUP))
-			BKE_group_handle_recalc_and_update(eval_ctx, scene_parent, object, object->dup_group);
-
-		/* always update layer, so that animating layers works (joshua july 2010) */
-		/* XXX commented out, this has depsgraph issues anyway - and this breaks setting scenes
-		 * (on scene-set, the base-lay is copied to ob-lay (ton nov 2012) */
-		// base->lay = ob->lay;
-	}
-}
-
-static void scene_update_object_func(TaskPool * __restrict pool, void *taskdata, int threadid)
-{
-/* Disable print for now in favor of summary statistics at the end of update. */
-#define PRINT if (false) printf
-
-	ThreadedObjectUpdateState *state = (ThreadedObjectUpdateState *) BLI_task_pool_userdata(pool);
-	void *node = taskdata;
-	Object *object = DAG_get_node_object(node);
-	EvaluationContext *eval_ctx = state->eval_ctx;
-	Scene *scene = state->scene;
-	Scene *scene_parent = state->scene_parent;
-
-#ifdef MBALL_SINGLETHREAD_HACK
-	if (object && object->type == OB_MBALL) {
-		state->has_mballs = true;
-	}
-	else
-#endif
-	if (object) {
-		double start_time = 0.0;
-		bool add_to_stats = false;
-
-		if (G.debug & G_DEBUG_DEPSGRAPH) {
-			if (object->recalc & OB_RECALC_ALL) {
-				printf("Thread %d: update object %s\n", threadid, object->id.name);
-			}
-
-			start_time = PIL_check_seconds_timer();
-
-			if (object->recalc & OB_RECALC_ALL) {
-				state->has_updated_objects = true;
-				add_to_stats = true;
-			}
-		}
-
-		/* We only update object itself here, dupli-group will be updated
-		 * separately from main thread because of we've got no idea about
-		 * dependencies inside the group.
-		 */
-		BKE_object_handle_update_ex(eval_ctx, scene_parent, object, scene->rigidbody_world, false);
-
-		/* Calculate statistics. */
-		if (add_to_stats) {
-			StatisicsEntry *entry;
-
-			BLI_assert(threadid < BLI_pool_get_num_threads(pool));
-
-			entry = MEM_mallocN(sizeof(StatisicsEntry), "update thread statistics");
-			entry->object = object;
-			entry->start_time = start_time;
-			entry->duration = PIL_check_seconds_timer() - start_time;
-
-			BLI_addtail(&state->statistics[threadid], entry);
-		}
-	}
-	else {
-		PRINT("Threda %d: update node %s\n", threadid,
-		      DAG_get_node_name(scene, node));
-	}
-
-	/* Update will decrease child's valency and schedule child with zero valency. */
-	DAG_threaded_update_handle_node_updated(node, scene_update_object_add_task, pool);
-
-#undef PRINT
-}
-
-static void scene_update_object_add_task(void *node, void *user_data)
-{
-	TaskPool *task_pool = user_data;
-
-	BLI_task_pool_push(task_pool, scene_update_object_func, node, false, TASK_PRIORITY_LOW);
-}
-
-static void print_threads_statistics(ThreadedObjectUpdateState *state)
-{
-	int i, tot_thread;
-	double finish_time;
-
-	if ((G.debug & G_DEBUG_DEPSGRAPH) == 0) {
-		return;
-	}
-
-#ifdef DETAILED_ANALYSIS_OUTPUT
-	if (state->has_updated_objects) {
-		tot_thread = BLI_system_thread_count();
-
-		fprintf(stderr, "objects update base time %f\n", state->base_time);
-
-		for (i = 0; i < tot_thread; i++) {
-			StatisicsEntry *entry;
-			for (entry = state->statistics[i].first;
-			     entry;
-			     entry = entry->next)
-			{
-				fprintf(stderr, "thread %d object %s start_time %f duration %f\n",
-				        i, entry->object->id.name + 2,
-				        entry->start_time, entry->duration);
-			}
-			BLI_freelistN(&state->statistics[i]);
-		}
-	}
-#else
-	finish_time = PIL_check_seconds_timer();
-	tot_thread = BLI_system_thread_count();
-	int total_objects = 0;
-
-	for (i = 0; i < tot_thread; i++) {
-		int thread_total_objects = 0;
-		double thread_total_time = 0.0;
-		StatisicsEntry *entry;
-
-		if (state->has_updated_objects) {
-			/* Don't pollute output if no objects were updated. */
-			for (entry = state->statistics[i].first;
-			     entry;
-			     entry = entry->next)
-			{
-				thread_total_objects++;
-				thread_total_time += entry->duration;
-			}
-
-			printf("Thread %d: total %d objects in %f sec.\n",
-			       i,
-			       thread_total_objects,
-			       thread_total_time);
-
-			for (entry = state->statistics[i].first;
-			     entry;
-			     entry = entry->next)
-			{
-				printf("  %s in %f sec\n", entry->object->id.name + 2, entry->duration);
-			}
-
-			total_objects += thread_total_objects;
-		}
-
-		BLI_freelistN(&state->statistics[i]);
-	}
-	if (state->has_updated_objects) {
-		printf("Scene updated %d objects in %f sec\n",
-		       total_objects,
-		       finish_time - state->base_time);
-	}
-#endif
-}
-
-static bool scene_need_update_objects(Main *bmain)
-{
-	return
-		/* Object datablocks themselves (for OB_RECALC_OB) */
-		DAG_id_type_tagged(bmain, ID_OB) ||
-
-		/* Objects data datablocks (for OB_RECALC_DATA) */
-		DAG_id_type_tagged(bmain, ID_ME)  ||  /* Mesh */
-		DAG_id_type_tagged(bmain, ID_CU)  ||  /* Curve */
-		DAG_id_type_tagged(bmain, ID_MB)  ||  /* MetaBall */
-		DAG_id_type_tagged(bmain, ID_LA)  ||  /* Lamp */
-		DAG_id_type_tagged(bmain, ID_LT)  ||  /* Lattice */
-		DAG_id_type_tagged(bmain, ID_CA)  ||  /* Camera */
-		DAG_id_type_tagged(bmain, ID_KE)  ||  /* KE */
-		DAG_id_type_tagged(bmain, ID_SPK) ||  /* Speaker */
-		DAG_id_type_tagged(bmain, ID_AR);     /* Armature */
-}
-
-static void scene_update_objects(EvaluationContext *eval_ctx, Main *bmain, Scene *scene, Scene *scene_parent)
-{
-	TaskScheduler *task_scheduler = BLI_task_scheduler_get();
-	TaskPool *task_pool;
-	ThreadedObjectUpdateState state;
-	bool need_singlethread_pass;
-
-	/* Early check for whether we need to invoke all the task-based
-	 * things (spawn new ppol, traverse dependency graph and so on).
-	 *
-	 * Basically if there's no ID datablocks tagged for update which
-	 * corresponds to object->recalc flags (which are checked in
-	 * BKE_object_handle_update() then we do nothing here.
-	 */
-	if (!scene_need_update_objects(bmain)) {
-		return;
-	}
-
-	state.eval_ctx = eval_ctx;
-	state.scene = scene;
-	state.scene_parent = scene_parent;
-
-	/* Those are only needed when blender is run with --debug argument. */
-	if (G.debug & G_DEBUG_DEPSGRAPH) {
-		const int tot_thread = BLI_task_scheduler_num_threads(task_scheduler);
-		state.statistics = MEM_callocN(tot_thread * sizeof(*state.statistics),
-		                               "scene update objects stats");
-		state.has_updated_objects = false;
-		state.base_time = PIL_check_seconds_timer();
-	}
-
-#ifdef MBALL_SINGLETHREAD_HACK
-	state.has_mballs = false;
-#endif
-
-	task_pool = BLI_task_pool_create(task_scheduler, &state);
-	if (G.debug & G_DEBUG_DEPSGRAPH_NO_THREADS) {
-		BLI_pool_set_num_threads(task_pool, 1);
-	}
-
-	DAG_threaded_update_begin(scene, scene_update_object_add_task, task_pool);
-	BLI_task_pool_work_and_wait(task_pool);
-	BLI_task_pool_free(task_pool);
-
-	if (G.debug & G_DEBUG_DEPSGRAPH) {
-		print_threads_statistics(&state);
-		MEM_freeN(state.statistics);
-	}
-
-	/* We do single thread pass to update all the objects which are in cyclic dependency.
-	 * Such objects can not be handled by a generic DAG traverse and it's really tricky
-	 * to detect whether cycle could be solved or not.
-	 *
-	 * In this situation we simply update all remaining objects in a single thread and
-	 * it'll happen in the same exact order as it was in single-threaded DAG.
-	 *
-	 * We couldn't use threaded update for objects which are in cycle because they might
-	 * access data of each other which is being re-evaluated.
-	 *
-	 * Also, as was explained above, for now we also update all the mballs in single thread.
-	 *
-	 *                                                                   - sergey -
-	 */
-	need_singlethread_pass = DAG_is_acyclic(scene) == false;
-#ifdef MBALL_SINGLETHREAD_HACK
-	need_singlethread_pass |= state.has_mballs;
-#endif
-
-	if (need_singlethread_pass) {
-		scene_update_all_bases(eval_ctx, scene, scene_parent);
-	}
-}
-
-static void scene_update_tagged_recursive(EvaluationContext *eval_ctx, Main *bmain, Scene *scene, Scene *scene_parent)
-{
-	scene->customdata_mask = scene_parent->customdata_mask;
-
-	/* sets first, we allow per definition current scene to have
-	 * dependencies on sets, but not the other way around. */
-	if (scene->set)
-		scene_update_tagged_recursive(eval_ctx, bmain, scene->set, scene_parent);
-
-	/* scene objects */
-	scene_update_objects(eval_ctx, bmain, scene, scene_parent);
-
-	/* scene drivers... */
-	scene_update_drivers(bmain, scene);
-
-	/* update masking curves */
-	BKE_mask_update_scene(bmain, scene);
-	
-}
-#endif  /* WITH_LEGACY_DEPSGRAPH */
-
 static bool check_rendered_viewport_visible(Main *bmain)
 {
 	wmWindowManager *wm = bmain->wm.first;
@@ -1873,9 +1426,6 @@ static void prepare_mesh_for_viewport_render(Main *bmain, Scene *scene)
 void BKE_scene_update_tagged(EvaluationContext *eval_ctx, Main *bmain, Scene *scene)
 {
 	Scene *sce_iter;
-#ifdef WITH_LEGACY_DEPSGRAPH
-	bool use_new_eval = !DEG_depsgraph_use_legacy();
-#endif
 
 	/* keep this first */
 	BLI_callback_exec(bmain, &scene->id, BLI_CB_EVT_SCENE_UPDATE_PRE);
@@ -1885,12 +1435,7 @@ void BKE_scene_update_tagged(EvaluationContext *eval_ctx, Main *bmain, Scene *sc
 		DAG_scene_relations_update(bmain, sce_iter);
 		/* Uncomment this to check if graph was properly tagged for update. */
 #if 0
-#ifdef WITH_LEGACY_DEPSGRAPH
-		if (use_new_eval)
-#endif
-		{
-			DAG_scene_relations_validate(bmain, sce_iter);
-		}
+		DAG_scene_relations_validate(bmain, sce_iter);
 #endif
 	}
 
@@ -1913,17 +1458,9 @@ void BKE_scene_update_tagged(EvaluationContext *eval_ctx, Main *bmain, Scene *sc
 	 *
 	 * in the future this should handle updates for all datablocks, not
 	 * only objects and scenes. - brecht */
-#ifdef WITH_LEGACY_DEPSGRAPH
-	if (!use_new_eval) {
-		scene_update_tagged_recursive(eval_ctx, bmain, scene, scene);
-	}
-	else
-#endif
-	{
-		DEG_evaluate_on_refresh(eval_ctx, scene->depsgraph, scene);
-		/* TODO(sergey): This is to beocme a node in new depsgraph. */
-		BKE_mask_update_scene(bmain, scene);
-	}
+	DEG_evaluate_on_refresh(eval_ctx, scene->depsgraph, scene);
+	/* TODO(sergey): This is to beocme a node in new depsgraph. */
+	BKE_mask_update_scene(bmain, scene);
 
 	/* update sound system animation (TODO, move to depsgraph) */
 	BKE_sound_update_scene(bmain, scene);
@@ -1937,40 +1474,6 @@ void BKE_scene_update_tagged(EvaluationContext *eval_ctx, Main *bmain, Scene *sc
 			BKE_animsys_evaluate_animdata(scene, &scene->id, adt, ctime, 0);
 	}
 
-	/* Extra call here to recalc material animation.
-	 *
-	 * Need to do this so changing material settings from the graph/dopesheet
-	 * will update stuff in the viewport.
-	 */
-#ifdef WITH_LEGACY_DEPSGRAPH
-	if (!use_new_eval && DAG_id_type_tagged(bmain, ID_MA)) {
-		Material *material;
-		float ctime = BKE_scene_frame_get(scene);
-
-		for (material = bmain->mat.first;
-		     material;
-		     material = material->id.next)
-		{
-			AnimData *adt = BKE_animdata_from_id(&material->id);
-			if (adt && (adt->recalc & ADT_RECALC_ANIM))
-				BKE_animsys_evaluate_animdata(scene, &material->id, adt, ctime, 0);
-		}
-	}
-
-	/* Also do the same for node trees. */
-	if (!use_new_eval && DAG_id_type_tagged(bmain, ID_NT)) {
-		float ctime = BKE_scene_frame_get(scene);
-
-		FOREACH_NODETREE(bmain, ntree, id)
-		{
-			AnimData *adt = BKE_animdata_from_id(&ntree->id);
-			if (adt && (adt->recalc & ADT_RECALC_ANIM))
-				BKE_animsys_evaluate_animdata(scene, &ntree->id, adt, ctime, 0);
-		}
-		FOREACH_NODETREE_END
-	}
-#endif
-
 	/* notify editors and python about recalc */
 	BLI_callback_exec(bmain, &scene->id, BLI_CB_EVT_SCENE_UPDATE_POST);
 
@@ -1987,19 +1490,10 @@ void BKE_scene_update_for_newframe(EvaluationContext *eval_ctx, Main *bmain, Sce
 	BKE_scene_update_for_newframe_ex(eval_ctx, bmain, sce, lay, false);
 }
 
-void BKE_scene_update_for_newframe_ex(EvaluationContext *eval_ctx, Main *bmain, Scene *sce, unsigned int lay, bool do_invisible_flush)
+void BKE_scene_update_for_newframe_ex(EvaluationContext *eval_ctx, Main *bmain, Scene *sce, unsigned int lay, bool UNUSED(do_invisible_flush))
 {
 	float ctime = BKE_scene_frame_get(sce);
 	Scene *sce_iter;
-#ifdef DETAILED_ANALYSIS_OUTPUT
-	double start_time = PIL_check_seconds_timer();
-#endif
-#ifdef WITH_LEGACY_DEPSGRAPH
-	bool use_new_eval = !DEG_depsgraph_use_legacy();
-#else
-	/* TODO(sergey): Pass to evaluation routines instead of storing layer in the graph? */
-	(void) do_invisible_flush;
-#endif
 
 	DAG_editors_update_pre(bmain, sce, true);
 
@@ -2010,38 +1504,15 @@ void BKE_scene_update_for_newframe_ex(EvaluationContext *eval_ctx, Main *bmain,
 	/* update animated image textures for particles, modifiers, gpu, etc,
 	 * call this at the start so modifiers with textures don't lag 1 frame */
 	BKE_image_update_frame(bmain, sce->r.cfra);
-	
-#ifdef WITH_LEGACY_DEPSGRAPH
-	/* rebuild rigid body worlds before doing the actual frame update
-	 * this needs to be done on start frame but animation playback usually starts one frame later
-	 * we need to do it here to avoid rebuilding the world on every simulation change, which can be very expensive
-	 */
-	if (!use_new_eval) {
-		scene_rebuild_rbw_recursive(sce, ctime);
-	}
-#endif
-	
+
 	BKE_sound_set_cfra(sce->r.cfra);
-	
+
 	/* clear animation overrides */
 	/* XXX TODO... */
 
 	for (sce_iter = sce; sce_iter; sce_iter = sce_iter->set)
 		DAG_scene_relations_update(bmain, sce_iter);
 
-#ifdef WITH_LEGACY_DEPSGRAPH
-	if (!use_new_eval) {
-		/* flush recalc flags to dependencies, if we were only changing a frame
-		 * this would not be necessary, but if a user or a script has modified
-		 * some datablock before BKE_scene_update_tagged was called, we need the flush */
-		DAG_ids_flush_tagged(bmain);
-
-		/* Following 2 functions are recursive
-		 * so don't call within 'scene_update_tagged_recursive' */
-		DAG_scene_update_flags(bmain, sce, lay, true, do_invisible_flush);   // only stuff that moves or needs display still
-	}
-#endif
-
 	BKE_mask_evaluate_all_masks(bmain, ctime, true);
 
 	/* Update animated cache files for modifiers. */
@@ -2051,54 +1522,18 @@ void BKE_scene_update_for_newframe_ex(EvaluationContext *eval_ctx, Main *bmain,
 	scene_armature_depsgraph_workaround(bmain);
 #endif
 
-	/* All 'standard' (i.e. without any dependencies) animation is handled here,
-	 * with an 'local' to 'macro' order of evaluation. This should ensure that
-	 * settings stored nestled within a hierarchy (i.e. settings in a Texture block
-	 * can be overridden by settings from Scene, which owns the Texture through a hierarchy
-	 * such as Scene->World->MTex/Texture) can still get correctly overridden.
-	 */
-#ifdef WITH_LEGACY_DEPSGRAPH
-	if (!use_new_eval) {
-		BKE_animsys_evaluate_all_animation(bmain, sce, ctime);
-		/*...done with recursive funcs */
-	}
-#endif
-
 	/* clear "LIB_TAG_DOIT" flag from all materials, to prevent infinite recursion problems later
 	 * when trying to find materials with drivers that need evaluating [#32017] 
 	 */
 	BKE_main_id_tag_idcode(bmain, ID_MA, LIB_TAG_DOIT, false);
 	BKE_main_id_tag_idcode(bmain, ID_LA, LIB_TAG_DOIT, false);
 
-	/* run rigidbody sim */
-	/* NOTE: current position is so that rigidbody sim affects other objects, might change in the future */
-#ifdef WITH_LEGACY_DEPSGRAPH
-	if (!use_new_eval) {
-		scene_do_rb_simulation_recursive(sce, ctime);
-	}
-#endif
-	
 	/* BKE_object_handle_update() on all objects, groups and sets */
-#ifdef WITH_LEGACY_DEPSGRAPH
-	if (use_new_eval) {
-		DEG_evaluate_on_framechange(eval_ctx, bmain, sce->depsgraph, ctime, lay);
-	}
-	else {
-		scene_update_tagged_recursive(eval_ctx, bmain, sce, sce);
-	}
-#else
 	DEG_evaluate_on_framechange(eval_ctx, bmain, sce->depsgraph, ctime, lay);
-#endif
 
 	/* update sound system animation (TODO, move to depsgraph) */
 	BKE_sound_update_scene(bmain, sce);
 
-#ifdef WITH_LEGACY_DEPSGRAPH
-	if (!use_new_eval) {
-		scene_depsgraph_hack(eval_ctx, sce, sce);
-	}
-#endif
-
 	/* notify editors and python about recalc */
 	BLI_callback_exec(bmain, &sce->id, BLI_CB_EVT_SCENE_UPDATE_POST);
 	BLI_callback_exec(bmain, &sce->id, BLI_CB_EVT_FRAME_CHANGE_POST);
@@ -2108,10 +1543,6 @@ void BKE_scene_update_for_newframe_ex(EvaluationContext *eval_ctx, Main *bmain,
 
 	/* clear recalc flags */
 	DAG_ids_clear_recalc(bmain);
-
-#ifdef DETAILED_ANALYSIS_OUTPUT
-	fprintf(stderr, "frame update start_time %f duration %f\n", start_time, PIL_check_seconds_timer() - start_time);
-#endif
 }
 
 /* return default layer, also used to patch old files */
diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index e635256cda6..2d32e85bf64 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -113,10 +113,6 @@ else()
 	endif()
 endif()
 
-if(WITH_LEGACY_DEPSGRAPH)
-	add_definitions(-DWITH_LEGACY_DEPSGRAPH)
-endif()
-
 if(WITH_BOOST)
 	list(APPEND INC_SYS
 		${BOOST_INCLUDE_DIR}
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
index 4a5f3dc8664..c1d51c1ace9 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
@@ -123,7 +123,7 @@ void DepsgraphNodeBuilder::build_rig(Scene *scene, Object *ob)
 
 	/* Rebuild pose if not up to date. */
 	if (ob->pose == NULL || (ob->pose->flag & POSE_RECALC)) {
-		BKE_pose_rebuild_ex(ob, arm, false);
+		BKE_pose_rebuild(ob, arm);
 		/* XXX: Without this animation gets lost in certain circumstances
 		 * after loading file. Need to investigate further since it does
 		 * not happen with simple scenes..
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc
index c41f28b07e8..ebaf0089835 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cc
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cc
@@ -52,43 +52,9 @@ extern "C" {
 
 #include "intern/depsgraph.h"
 
-#ifdef WITH_LEGACY_DEPSGRAPH
-static bool use_legacy_depsgraph = true;
-#endif
-
 /* Unfinished and unused, and takes quite some pre-processing time. */
 #undef USE_EVAL_PRIORITY
 
-bool DEG_depsgraph_use_legacy(void)
-{
-#ifdef DISABLE_NEW_DEPSGRAPH
-	return true;
-#elif defined(WITH_LEGACY_DEPSGRAPH)
-	return use_legacy_depsgraph;
-#else
-	BLI_assert(!"Should not be used with new depsgraph");
-	return false;
-#endif
-}
-
-void DEG_depsgraph_switch_to_legacy(void)
-{
-#ifdef WITH_LEGACY_DEPSGRAPH
-	use_legacy_depsgraph = true;
-#else
-	BLI_assert(!"Should not be used with new depsgraph");
-#endif
-}
-
-void DEG_depsgraph_switch_to_new(void)
-{
-#ifdef WITH_LEGACY_DEPSGRAPH
-	use_legacy_depsgraph = false;
-#else
-	BLI_assert(!"Should not be used with new depsgraph");
-#endif
-}
-
 /* ****************** */
 /* Evaluation Context */
 
diff --git a/source/blender/depsgraph/util/deg_util_foreach.h b/source/blender/depsgraph/util/deg_util_foreach.h
index 87d37168d51..8c234eae7de 100644
--- a/source/blender/depsgraph/util/deg_util_foreach.h
+++ b/source/blender/depsgraph/util/deg_util_foreach.h
@@ -36,15 +36,7 @@
 #  include <boost/foreach.hpp>
 #  define foreach BOOST_FOREACH
 #else
-#pragma message("No available foreach() implementation. Using stub instead, disabling new depsgraph")
-
-#ifndef WITH_LEGACY_DEPSGRAPH
-#  error "Unable to build new depsgraph and legacy one is disabled."
-#endif
-
-#define DISABLE_NEW_DEPSGRAPH
-
-#  define foreach(x, y) for (x; false; (void)y)
+#  error "Depsgraph requires either Boost or C++11 for range-based loops."
 #endif
 
 #define GHASH_FOREACH_BEGIN(type, var, what) \
diff --git a/source/blender/depsgraph/util/deg_util_function.h b/source/blender/depsgraph/util/deg_util_function.h
index 1e34ae04d9a..da31bb037f9 100644
--- a/source/blender/depsgraph/util/deg_util_function.h
+++ b/source/blender/depsgraph/util/deg_util_function.h
@@ -47,64 +47,5 @@ using boost::function;
 #define function_bind boost::bind
 
 #else
-
-#pragma message("No available function binding implementation. Using stub instead, disabling new depsgraph")
-
-#ifndef WITH_LEGACY_DEPSGRAPH
-#  error "Unable to build new depsgraph and legacy one is disabled."
-#endif
-
-#define DISABLE_NEW_DEPSGRAPH
-
-#include "BLI_utildefines.h"
-#include <cstdlib>
-
-template<typename T>
-class function {
-public:
-	function() {};
-	function(void *) {}
-	operator bool() const { return false; }
-	bool operator== (void *) { return false; }
-
-	template<typename T1>
-	void operator() (T1) {
-		BLI_assert(!"Should not be used");
-	}
-};
-
-class Wrap {
-public:
-	Wrap() {}
-	template <typename T>
-	Wrap(T /*arg*/) {}
-};
-
-template <typename T>
-void *function_bind(T func,
-                    Wrap arg1 = Wrap(),
-                    Wrap arg2 = Wrap(),
-                    Wrap arg3 = Wrap(),
-                    Wrap arg4 = Wrap(),
-                    Wrap arg5 = Wrap(),
-                    Wrap arg6 = Wrap(),
-                    Wrap arg7 = Wrap())
-{
-	BLI_assert(!"Should not be used");
-	(void)func;
-	(void)arg1;
-	(void)arg2;
-	(void)arg3;
-	(void)arg4;
-	(void)arg5;
-	(void)arg6;
-	(void)arg7;
-	return NULL;
-}
-
-#define _1 Wrap()
-#define _2 Wrap()
-#define _3 Wrap()
-#define _4 Wrap()
-
+#  error "Depsgraph requires either Boost or C++11 for function bindings."
 #endif
diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c
index d82d38ac0eb..feea9cf5b13 100644
--- a/source/blender/editors/space_action/action_draw.c
+++ b/source/blender/editors/space_action/action_draw.c
@@ -277,7 +277,7 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
 						{
 							FCurve *fcu = ale->data;
 							if (show_group_colors && fcu->grp && fcu->grp->customCol) {
-								unsigned char *cp = fcu->grp->cs.active;
+								unsigned char *cp = (unsigned char *)fcu->grp->cs.active;
 								
 								if (sel) immUniformColor4ub(cp[0], cp[1], cp[2], 0x65);
 								else immUniformColor4ub(cp[0], cp[1], cp[2], 0x0B);
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index 8fca2ed564e..f6d5cf6e5d2 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -95,8 +95,4 @@ if(WITH_MOD_SMOKE)
 	add_definitions(-DWITH_SMOKE)
 endif()
 
-if(WITH_LEGACY_DEPSGRAPH)
-	add_definitions(-DWITH_LEGACY_DEPSGRAPH)
-endif()
-
 blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 5e8216b6fc7..5aca365886d 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -65,6 +65,7 @@
 #include "BKE_lattice.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
+#include "BKE_mesh_render.h"
 #include "BKE_material.h"
 #include "BKE_mball.h"
 #include "BKE_modifier.h"
@@ -214,340 +215,6 @@ typedef struct drawBMSelect_userData {
 	bool select;
 } drawBMSelect_userData;
 
-typedef struct {
-	VertexBuffer *pos_in_order;
-	ElementList *edges_in_order;
-	ElementList *triangles_in_order;
-
-	Batch *all_verts;
-	Batch *all_edges;
-	Batch *all_triangles;
-
-	Batch *fancy_edges; /* owns its vertex buffer (not shared) */
-	Batch *overlay_edges; /* owns its vertex buffer */
-} MeshBatchCache;
-
-static void MBC_discard(MeshBatchCache *cache)
-{
-	if (cache->all_verts) Batch_discard(cache->all_verts);
-	if (cache->all_edges) Batch_discard(cache->all_edges);
-	if (cache->all_triangles) Batch_discard(cache->all_triangles);
-
-	if (cache->pos_in_order) VertexBuffer_discard(cache->pos_in_order);
-	if (cache->edges_in_order) ElementList_discard(cache->edges_in_order);
-	if (cache->triangles_in_order) ElementList_discard(cache->triangles_in_order);
-
-	if (cache->fancy_edges) {
-		Batch_discard_all(cache->fancy_edges);
-	}
-
-	if (cache->overlay_edges) {
-		Batch_discard_all(cache->overlay_edges);
-	}
-
-	MEM_freeN(cache);
-}
-
-static MeshBatchCache *MBC_get(DerivedMesh *dm)
-{
-	if (dm->batchCache == NULL) {
-		/* create cache */
-		dm->batchCache = MEM_callocN(sizeof(MeshBatchCache), "MeshBatchCache");
-		/* init everything to 0 is ok for now */
-
-
-		/* tell DerivedMesh how to clean up these caches (just once) */
-		/* TODO: find a better place for this w/out exposing internals to DM */
-		/* TODO (long term): replace DM with something less messy */
-		static bool first = true;
-		if (first) {
-			DM_set_batch_cleanup_callback((DMCleanupBatchCache)MBC_discard);
-			first = false;
-		}
-	}
-
-	return dm->batchCache;
-}
-
-static VertexBuffer *MBC_get_pos_in_order(DerivedMesh *dm)
-{
-	MeshBatchCache *cache = MBC_get(dm);
-
-	if (cache->pos_in_order == NULL) {
-		static VertexFormat format = { 0 };
-		static unsigned pos_id;
-		if (format.attrib_ct == 0) {
-			/* initialize vertex format */
-			pos_id = add_attrib(&format, "pos", GL_FLOAT, 3, KEEP_FLOAT);
-		}
-
-		const int vertex_ct = dm->getNumVerts(dm);
-		const MVert *verts = dm->getVertArray(dm);
-		const unsigned stride = (verts + 1) - verts; /* or sizeof(MVert) */
-
-		cache->pos_in_order = VertexBuffer_create_with_format(&format);
-		VertexBuffer_allocate_data(cache->pos_in_order, vertex_ct);
-#if 0
-		fillAttribStride(cache->pos_in_order, pos_id, stride, &verts[0].co);
-#else
-		for (int i = 0; i < vertex_ct; ++i) {
-			setAttrib(cache->pos_in_order, pos_id, i, &verts[i].co);
-		}
-#endif
-	}
-
-	return cache->pos_in_order;
-}
-
-static Batch *MBC_get_all_verts(DerivedMesh *dm)
-{
-	MeshBatchCache *cache = MBC_get(dm);
-
-	if (cache->all_verts == NULL) {
-		/* create batch from DM */
-		cache->all_verts = Batch_create(GL_POINTS, MBC_get_pos_in_order(dm), NULL);
-		Batch_set_builtin_program(cache->all_verts, GPU_SHADER_3D_POINT_FIXED_SIZE_UNIFORM_COLOR);
-	}
-
-	return cache->all_verts;
-}
-
-static ElementList *MBC_get_edges_in_order(DerivedMesh *dm)
-{
-	MeshBatchCache *cache = MBC_get(dm);
-
-	if (cache->edges_in_order == NULL) {
-		const int vertex_ct = dm->getNumVerts(dm);
-		const int edge_ct = dm->getNumEdges(dm);
-		const MEdge *edges = dm->getEdgeArray(dm);
-		ElementListBuilder elb;
-		ElementListBuilder_init(&elb, GL_LINES, edge_ct, vertex_ct);
-		for (int i = 0; i < edge_ct; ++i) {
-			const MEdge *edge = edges + i;
-			add_line_vertices(&elb, edge->v1, edge->v2);
-		}
-		cache->edges_in_order = ElementList_build(&elb);
-	}
-
-	return cache->edges_in_order;
-}
-
-static ElementList *MBC_get_triangles_in_order(DerivedMesh *dm)
-{
-	MeshBatchCache *cache = MBC_get(dm);
-
-	if (cache->triangles_in_order == NULL) {
-		const int vertex_ct = dm->getNumVerts(dm);
-		const int tessface_ct = dm->getNumTessFaces(dm);
-		const MFace *tessfaces = dm->getTessFaceArray(dm);
-		ElementListBuilder elb;
-		ElementListBuilder_init(&elb, GL_TRIANGLES, tessface_ct, vertex_ct);
-		for (int i = 0; i < tessface_ct; ++i) {
-			const MFace *tess = tessfaces + i;
-			add_triangle_vertices(&elb, tess->v1, tess->v2, tess->v3);
-			/* tessface can be triangle or quad */
-			if (tess->v4) {
-				add_triangle_vertices(&elb, tess->v3, tess->v2, tess->v4);
-			}
-		}
-		cache->triangles_in_order = ElementList_build(&elb);
-	}
-
-	return cache->triangles_in_order;
-}
-
-static Batch *MBC_get_all_edges(DerivedMesh *dm)
-{
-	MeshBatchCache *cache = MBC_get(dm);
-
-	if (cache->all_edges == NULL) {
-		/* create batch from DM */
-		cache->all_edges = Batch_create(GL_LINES, MBC_get_pos_in_order(dm), MBC_get_edges_in_order(dm));
-	}
-
-	return cache->all_edges;
-}
-
-static Batch *MBC_get_all_triangles(DerivedMesh *dm)
-{
-	MeshBatchCache *cache = MBC_get(dm);
-
-	if (cache->all_triangles == NULL) {
-		/* create batch from DM */
-		cache->all_triangles = Batch_create(GL_TRIANGLES, MBC_get_pos_in_order(dm), MBC_get_triangles_in_order(dm));
-	}
-
-	return cache->all_triangles;
-}
-
-static Batch *MBC_get_fancy_edges(DerivedMesh *dm)
-{
-	MeshBatchCache *cache = MBC_get(dm);
-
-	if (cache->fancy_edges == NULL) {
-		/* create batch from DM */
-		static VertexFormat format = { 0 };
-		static unsigned pos_id, n1_id, n2_id;
-		if (format.attrib_ct == 0) {
-			/* initialize vertex format */
-			pos_id = add_attrib(&format, "pos", COMP_F32, 3, KEEP_FLOAT);
-
-#if USE_10_10_10 /* takes 1/3 the space */
-			n1_id = add_attrib(&format, "N1", COMP_I10, 3, NORMALIZE_INT_TO_FLOAT);
-			n2_id = add_attrib(&format, "N2", COMP_I10, 3, NORMALIZE_INT_TO_FLOAT);
-#else
-			n1_id = add_attrib(&format, "N1", COMP_F32, 3, KEEP_FLOAT);
-			n2_id = add_attrib(&format, "N2", COMP_F32, 3, KEEP_FLOAT);
-#endif
-		}
-		VertexBuffer *vbo = VertexBuffer_create_with_format(&format);
-
-		const MVert *verts = dm->getVertArray(dm);
-		const MEdge *edges = dm->getEdgeArray(dm);
-		const MPoly *polys = dm->getPolyArray(dm);
-		const MLoop *loops = dm->getLoopArray(dm);
-		const int edge_ct = dm->getNumEdges(dm);
-		const int poly_ct = dm->getNumPolys(dm);
-
-		/* need normal of each face, and which faces are adjacent to each edge */
-		typedef struct {
-			int count;
-			int face_index[2];
-		} AdjacentFaces;
-
-		float (*face_normal)[3] = MEM_mallocN(poly_ct * 3 * sizeof(float), "face_normal");
-		AdjacentFaces *adj_faces = MEM_callocN(edge_ct * sizeof(AdjacentFaces), "adj_faces");
-
-		for (int i = 0; i < poly_ct; ++i) {
-			const MPoly *poly = polys + i;
-
-			BKE_mesh_calc_poly_normal(poly, loops + poly->loopstart, verts, face_normal[i]);
-
-			for (int j = poly->loopstart; j < (poly->loopstart + poly->totloop); ++j) {
-				AdjacentFaces *adj = adj_faces + loops[j].e;
-				if (adj->count < 2)
-					adj->face_index[adj->count] = i;
-				adj->count++;
-			}
-		}
-
-		const int vertex_ct = edge_ct * 2; /* these are GL_LINE verts, not mesh verts */
-		VertexBuffer_allocate_data(vbo, vertex_ct);
-		for (int i = 0; i < edge_ct; ++i) {
-			const MEdge *edge = edges + i;
-			const AdjacentFaces *adj = adj_faces + i;
-
-#if USE_10_10_10
-			PackedNormal n1value = { .x = 0, .y = 0, .z = +511 };
-			PackedNormal n2value = { .x = 0, .y = 0, .z = -511 };
-
-			if (adj->count == 2) {
-				n1value = convert_i10_v3(face_normal[adj->face_index[0]]);
-				n2value = convert_i10_v3(face_normal[adj->face_index[1]]);
-			}
-
-			const PackedNormal *n1 = &n1value;
-			const PackedNormal *n2 = &n2value;
-#else
-			const float dummy1[3] = { 0.0f, 0.0f, +1.0f };
-			const float dummy2[3] = { 0.0f, 0.0f, -1.0f };
-
-			const float *n1 = (adj->count == 2) ? face_normal[adj->face_index[0]] : dummy1;
-			const float *n2 = (adj->count == 2) ? face_normal[adj->face_index[1]] : dummy2;
-#endif
-
-			setAttrib(vbo, pos_id, 2 * i, &verts[edge->v1].co);
-			setAttrib(vbo, n1_id, 2 * i, n1);
-			setAttrib(vbo, n2_id, 2 * i, n2);
-
-			setAttrib(vbo, pos_id, 2 * i + 1, &verts[edge->v2].co);
-			setAttrib(vbo, n1_id, 2 * i + 1, n1);
-			setAttrib(vbo, n2_id, 2 * i + 1, n2);
-		}
-
-		MEM_freeN(adj_faces);
-		MEM_freeN(face_normal);
-
-		cache->fancy_edges = Batch_create(GL_LINES, vbo, NULL);
-	}
-
-	return cache->fancy_edges;
-}
-
-static bool edge_is_real(const MEdge *edges, int edge_ct, int v1, int v2)
-{
-	/* TODO: same thing, except not ridiculously slow */
-
-	for (int e = 0; e < edge_ct; ++e) {
-		const MEdge *edge = edges + e;
-		if ((edge->v1 == v1 && edge->v2 == v2) || (edge->v1 == v2 && edge->v2 == v1)) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-static void add_overlay_tri(VertexBuffer *vbo, unsigned pos_id, unsigned edgeMod_id, const MVert *verts, const MEdge *edges, int edge_ct, int v1, int v2, int v3, int base_vert_idx)
-{
-	const float edgeMods[2] = { 0.0f, 1.0f };
-
-	const float *pos = verts[v1].co;
-	setAttrib(vbo, pos_id, base_vert_idx + 0, pos);
-	setAttrib(vbo, edgeMod_id, base_vert_idx + 0, edgeMods + (edge_is_real(edges, edge_ct, v2, v3) ? 1 : 0));
-
-	pos = verts[v2].co;
-	setAttrib(vbo, pos_id, base_vert_idx + 1, pos);
-	setAttrib(vbo, edgeMod_id, base_vert_idx + 1, edgeMods + (edge_is_real(edges, edge_ct, v3, v1) ? 1 : 0));
-
-	pos = verts[v3].co;
-	setAttrib(vbo, pos_id, base_vert_idx + 2, pos);
-	setAttrib(vbo, edgeMod_id, base_vert_idx + 2, edgeMods + (edge_is_real(edges, edge_ct, v1, v2) ? 1 : 0));
-}
-
-static Batch *MBC_get_overlay_edges(DerivedMesh *dm)
-{
-	MeshBatchCache *cache = MBC_get(dm);
-
-	if (cache->overlay_edges == NULL) {
-		/* create batch from DM */
-		static VertexFormat format = { 0 };
-		static unsigned pos_id, edgeMod_id;
-		if (format.attrib_ct == 0) {
-			/* initialize vertex format */
-			pos_id = add_attrib(&format, "pos", GL_FLOAT, 3, KEEP_FLOAT);
-			edgeMod_id = add_attrib(&format, "edgeWidthModulator", GL_FLOAT, 1, KEEP_FLOAT);
-		}
-		VertexBuffer *vbo = VertexBuffer_create_with_format(&format);
-
-		const int vertex_ct = dm->getNumVerts(dm);
-		const int edge_ct = dm->getNumEdges(dm);
-		const int tessface_ct = dm->getNumTessFaces(dm);
-		const MVert *verts = dm->getVertArray(dm);
-		const MEdge *edges = dm->getEdgeArray(dm);
-		const MFace *tessfaces = dm->getTessFaceArray(dm);
-
-		VertexBuffer_allocate_data(vbo, tessface_ct * 6); /* up to 2 triangles per tessface */
-
-		int gpu_vert_idx = 0;
-		for (int i = 0; i < tessface_ct; ++i) {
-			const MFace *tess = tessfaces + i;
-			add_overlay_tri(vbo, pos_id, edgeMod_id, verts, edges, edge_ct, tess->v1, tess->v2, tess->v3, gpu_vert_idx);
-			gpu_vert_idx += 3;
-			/* tessface can be triangle or quad */
-			if (tess->v4) {
-				add_overlay_tri(vbo, pos_id, edgeMod_id, verts, edges, edge_ct, tess->v3, tess->v2, tess->v4, gpu_vert_idx);
-				gpu_vert_idx += 3;
-			}
-		}
-
-		VertexBuffer_resize_data(vbo, gpu_vert_idx);
-
-		cache->overlay_edges = Batch_create(GL_TRIANGLES, vbo, NULL);
-	}
-
-	return cache->overlay_edges;
-}
 
 static void drawcube_size(float size, unsigned pos);
 static void drawcircle_size(float size, unsigned pos);
@@ -4370,11 +4037,10 @@ static void draw_em_fancy(Scene *scene, ARegion *ar, View3D *v3d,
 }
 
 static void draw_em_fancy_new(Scene *UNUSED(scene), ARegion *ar, View3D *UNUSED(v3d),
-                              Object *UNUSED(ob), BMEditMesh *UNUSED(em), DerivedMesh *cageDM, DerivedMesh *UNUSED(finalDM), const char UNUSED(dt))
+                              Object *UNUSED(ob), Mesh *me, BMEditMesh *UNUSED(em), DerivedMesh *UNUSED(cageDM), DerivedMesh *UNUSED(finalDM), const char UNUSED(dt))
 {
 	/* for now... something simple! */
-
-	Batch *surface = MBC_get_all_triangles(cageDM);
+	Batch *surface = BKE_mesh_batch_cache_get_all_triangles(me);
 
 	glEnable(GL_DEPTH_TEST);
 	glDepthFunc(GL_LEQUAL);
@@ -4408,7 +4074,7 @@ static void draw_em_fancy_new(Scene *UNUSED(scene), ARegion *ar, View3D *UNUSED(
 	Batch_draw(surface);
 
 	if (GLEW_VERSION_3_2) {
-		Batch *overlay = MBC_get_overlay_edges(cageDM);
+		Batch *overlay = BKE_mesh_batch_cache_get_overlay_edges(me);
 		Batch_set_builtin_program(overlay, GPU_SHADER_EDGES_OVERLAY);
 		Batch_Uniform2f(overlay, "viewportSize", ar->winx, ar->winy);
 		Batch_draw(overlay);
@@ -4426,7 +4092,7 @@ static void draw_em_fancy_new(Scene *UNUSED(scene), ARegion *ar, View3D *UNUSED(
 #endif
 	}
 	else {
-		Batch *edges = MBC_get_all_edges(cageDM);
+		Batch *edges = BKE_mesh_batch_cache_get_all_edges(me);
 		Batch_set_builtin_program(edges, GPU_SHADER_3D_UNIFORM_COLOR);
 		Batch_Uniform4f(edges, "color", 0.0f, 0.0f, 0.0f, 1.0f);
 		glEnable(GL_LINE_SMOOTH);
@@ -4436,7 +4102,7 @@ static void draw_em_fancy_new(Scene *UNUSED(scene), ARegion *ar, View3D *UNUSED(
 	}
 
 #if 0 /* looks good even without points */
-	Batch *verts = MBC_get_all_verts(cageDM);
+	Batch *verts = MBC_get_all_verts(me);
 	glEnable(GL_BLEND);
 
 	Batch_set_builtin_program(verts, GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_SMOOTH);
@@ -4474,7 +4140,7 @@ void draw_mesh_object_outline(View3D *v3d, Object *ob, DerivedMesh *dm) /* LEGAC
 	}
 }
 
-static void draw_mesh_object_outline_new(View3D *v3d, RegionView3D *rv3d, Object *ob, DerivedMesh *dm, const bool is_active)
+static void draw_mesh_object_outline_new(View3D *v3d, RegionView3D *rv3d, Object *ob, Mesh *me, const bool is_active)
 {
 	if ((v3d->transp == false) &&  /* not when we draw the transparent pass */
 	    (ob->mode & OB_MODE_ALL_PAINT) == false) /* not when painting (its distracting) - campbell */
@@ -4486,7 +4152,7 @@ static void draw_mesh_object_outline_new(View3D *v3d, RegionView3D *rv3d, Object
 		UI_GetThemeColor4fv((is_active ? TH_ACTIVE : TH_SELECT), outline_color);
 
 #if 1 /* new version that draws only silhouette edges */
-		Batch *fancy_edges = MBC_get_fancy_edges(dm);
+		Batch *fancy_edges = BKE_mesh_batch_cache_get_fancy_edges(me);
 
 		if (rv3d->persp == RV3D_ORTHO) {
 			Batch_set_builtin_program(fancy_edges, GPU_SHADER_EDGES_FRONT_BACK_ORTHO);
@@ -5009,7 +4675,7 @@ static void draw_mesh_fancy_new(Scene *scene, ARegion *ar, View3D *v3d, RegionVi
 
 #if 1 /* fancy wireframes */
 
-		Batch *fancy_edges = MBC_get_fancy_edges(dm);
+		Batch *fancy_edges = BKE_mesh_batch_cache_get_fancy_edges(me);
 
 		if (rv3d->persp == RV3D_ORTHO) {
 			Batch_set_builtin_program(fancy_edges, GPU_SHADER_EDGES_FRONT_BACK_ORTHO);
@@ -5069,7 +4735,7 @@ static void draw_mesh_fancy_new(Scene *scene, ARegion *ar, View3D *v3d, RegionVi
 		    !(G.f & G_PICKSEL || (draw_flags & DRAW_FACE_SELECT)) &&
 		    (draw_wire == OBDRAW_WIRE_OFF))
 		{
-			draw_mesh_object_outline_new(v3d, rv3d, ob, dm, (ob == OBACT));
+			draw_mesh_object_outline_new(v3d, rv3d, ob, me, (ob == OBACT));
 		}
 
 		if (draw_glsl_material(scene, ob, v3d, dt) && !(draw_flags & DRAW_MODIFIERS_PREVIEW)) {
@@ -5136,7 +4802,7 @@ static void draw_mesh_fancy_new(Scene *scene, ARegion *ar, View3D *v3d, RegionVi
 				    (draw_wire == OBDRAW_WIRE_OFF) &&
 				    (ob->sculpt == NULL))
 				{
-					draw_mesh_object_outline_new(v3d, rv3d, ob, dm, (ob == OBACT));
+					draw_mesh_object_outline_new(v3d, rv3d, ob, me, (ob == OBACT));
 				}
 
 				/* materials arent compatible with vertex colors */
@@ -5161,7 +4827,7 @@ static void draw_mesh_fancy_new(Scene *scene, ARegion *ar, View3D *v3d, RegionVi
 			    (ob->sculpt == NULL))
 			{
 				/* TODO: move this into a separate pass */
-				draw_mesh_object_outline_new(v3d, rv3d, ob, dm, (ob == OBACT));
+				draw_mesh_object_outline_new(v3d, rv3d, ob, me, (ob == OBACT));
 			}
 
 			glFrontFace((ob->transflag & OB_NEG_SCALE) ? GL_CW : GL_CCW);
@@ -5310,7 +4976,7 @@ static bool draw_mesh_object_new(Scene *scene, ARegion *ar, View3D *v3d, RegionV
 			GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL);
 		}
 
-		draw_em_fancy_new(scene, ar, v3d, ob, em, cageDM, finalDM, dt);
+		draw_em_fancy_new(scene, ar, v3d, ob, me, em, cageDM, finalDM, dt);
 
 		if (use_material) {
 			GPU_end_object_materials();
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index eaddbe29036..ddaba639fbc 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -937,21 +937,13 @@ static void view3d_main_region_listener(bScreen *sc, ScrArea *sa, ARegion *ar, w
 			switch (wmn->data) {
 				case ND_SHADING:
 				case ND_NODES:
-				{
-#ifdef WITH_LEGACY_DEPSGRAPH
-					Object *ob = OBACT;
-					if ((v3d->drawtype == OB_MATERIAL) ||
-					    (ob && (ob->mode == OB_MODE_TEXTURE_PAINT)) ||
-					    (v3d->drawtype == OB_TEXTURE &&
-					     (scene->gm.matmode == GAME_MAT_GLSL ||
-					      BKE_scene_use_new_shading_nodes(scene))) ||
-					    !DEG_depsgraph_use_legacy())
-#endif
-					{
-						ED_region_tag_redraw(ar);
-					}
+					/* TODO(sergey) This is a bit too much updates, but needed to
+					 * have proper material drivers update in the viewport.
+					 *
+					 * How to solve?
+					 */
+					ED_region_tag_redraw(ar);
 					break;
-				}
 				case ND_SHADING_DRAW:
 				case ND_SHADING_LINKS:
 					ED_region_tag_redraw(ar);
@@ -968,12 +960,10 @@ static void view3d_main_region_listener(bScreen *sc, ScrArea *sa, ARegion *ar, w
 		case NC_LAMP:
 			switch (wmn->data) {
 				case ND_LIGHTING:
-					if ((v3d->drawtype == OB_MATERIAL) ||
-					    (v3d->drawtype == OB_TEXTURE && (scene->gm.matmode == GAME_MAT_GLSL)) ||
-					    !DEG_depsgraph_use_legacy())
-					{
-						ED_region_tag_redraw(ar);
-					}
+					/* TODO(sergey): This is a bit too much, but needed to
+					 * handle updates from new depsgraph.
+					 */
+					ED_region_tag_redraw(ar);
 					break;
 				case ND_LIGHTING_DRAW:
 					ED_region_tag_redraw(ar);
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index b7de49d8158..1a41d9ac95a 100644
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -58,10 +58,6 @@ if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
-if(WITH_LEGACY_DEPSGRAPH)
-	add_definitions(-DWITH_LEGACY_DEPSGRAPH)
-endif()
-
 add_definitions(${GL_DEFINITIONS})
 
 blender_add_lib(bf_editor_transform "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index a8f13d85db9..87e720c4484 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -828,7 +828,6 @@ static void pose_grab_with_ik_clear(Object *ob)
 	bKinematicConstraint *data;
 	bPoseChannel *pchan;
 	bConstraint *con, *next;
-	bool need_dependency_update = false;
 
 	for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
 		/* clear all temporary lock flags */
@@ -843,7 +842,6 @@ static void pose_grab_with_ik_clear(Object *ob)
 				data = con->data;
 				if (data->flag & CONSTRAINT_IK_TEMP) {
 					/* iTaSC needs clear for removed constraints */
-					need_dependency_update = true;
 					BIK_clear_data(ob->pose);
 
 					BLI_remlink(&pchan->constraints, con);
@@ -858,13 +856,8 @@ static void pose_grab_with_ik_clear(Object *ob)
 		}
 	}
 
-#ifdef WITH_LEGACY_DEPSGRAPH
-	if (!DEG_depsgraph_use_legacy() && need_dependency_update)
-#endif
-	{
-		/* TODO(sergey): Consider doing partial update only. */
-		DAG_relations_tag_update(G.main);
-	}
+	/* TODO(sergey): Consider doing partial update only. */
+	DAG_relations_tag_update(G.main);
 }
 
 /* adds the IK to pchan - returns if added */
@@ -1017,13 +1010,8 @@ static short pose_grab_with_ik(Object *ob)
 	/* iTaSC needs clear for new IK constraints */
 	if (tot_ik) {
 		BIK_clear_data(ob->pose);
-#ifdef WITH_LEGACY_DEPSGRAPH
-		if (!DEG_depsgraph_use_legacy())
-#endif
-		{
-			/* TODO(sergey): Consuder doing partial update only. */
-			DAG_relations_tag_update(G.main);
-		}
+		/* TODO(sergey): Consuder doing partial update only. */
+		DAG_relations_tag_update(G.main);
 	}
 
 	return (tot_ik) ? 1 : 0;
@@ -5421,11 +5409,6 @@ static void set_trans_object_base_flags(TransInfo *t)
 		}
 	}
 
-	/* all recalc flags get flushed to all layers, so a layer flip later on works fine */
-#ifdef WITH_LEGACY_DEPSGRAPH
-	DAG_scene_flush_update(G.main, t->scene, -1, 0);
-#endif
-
 	/* and we store them temporal in base (only used for transform code) */
 	/* this because after doing updates, the object->recalc is cleared */
 	for (base = scene->base.first; base; base = base->next) {
@@ -5503,9 +5486,6 @@ static int count_proportional_objects(TransInfo *t)
 
 	/* all recalc flags get flushed to all layers, so a layer flip later on works fine */
 	DAG_scene_relations_update(G.main, t->scene);
-#ifdef WITH_LEGACY_DEPSGRAPH
-	DAG_scene_flush_update(G.main, t->scene, -1, 0);
-#endif
 
 	/* and we store them temporal in base (only used for transform code) */
 	/* this because after doing updates, the object->recalc is cleared */
diff --git a/source/blender/gpu/gawain/batch.h b/source/blender/gpu/gawain/batch.h
index c2768377a96..932ee182703 100644
--- a/source/blender/gpu/gawain/batch.h
+++ b/source/blender/gpu/gawain/batch.h
@@ -21,7 +21,7 @@ typedef enum {
 	READY_TO_DRAW
 } BatchPhase;
 
-typedef struct {
+typedef struct Batch{
 	// geometry
 	VertexBuffer* verts;
 	ElementList* elem; // NULL if element list not needed
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index 39e56925903..15ea3d4d37a 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -127,6 +127,7 @@ typedef struct Mesh {
 	short totcol;
 
 	struct Multires *mr DNA_DEPRECATED; /* deprecated multiresolution modeling data, only keep for loading old files */
+	void *batch_cache;
 } Mesh;
 
 /* deprecated by MTFace, only here for file reading */
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 25cd7265c3e..6e0d6ad2bcd 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -784,11 +784,16 @@ static void rna_GPencilPalette_info_set(PointerRNA *ptr, const char *value)
 	bGPdata *gpd = ptr->id.data;
 	bGPDpalette *palette = ptr->data;
 
+	char oldname[64] = "";
+	BLI_strncpy(oldname, palette->info, sizeof(oldname));
+
 	/* copy the new name into the name slot */
 	BLI_strncpy_utf8(palette->info, value, sizeof(palette->info));
 
 	BLI_uniquename(&gpd->palettes, palette, DATA_("GP_Palette"), '.', offsetof(bGPDpalette, info),
 	               sizeof(palette->info));
+	/* now fix animation paths */
+	BKE_animdata_fix_paths_rename_all(&gpd->id, "palettes", oldname, palette->info);
 }
 
 static char *rna_GPencilPalette_path(PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index e68e67586e9..0eab38faca8 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -3937,7 +3937,7 @@ static void rna_def_userdef_system(BlenderRNA *brna)
 
 	prop = RNA_def_property(srna, "dpi", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "dpi");
-	RNA_def_property_range(prop, 48, 144);
+	RNA_def_property_range(prop, 16, 256);
 	RNA_def_property_ui_text(prop, "DPI", "Font size and resolution for display");
 	RNA_def_property_update(prop, 0, "rna_userdef_dpi_update");
 
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c
index 567505ea45d..8efa4d63675 100644
--- a/source/blender/modifiers/intern/MOD_armature.c
+++ b/source/blender/modifiers/intern/MOD_armature.c
@@ -99,22 +99,6 @@ static void foreachObjectLink(
 	walk(userData, ob, &amd->object, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	ArmatureModifierData *amd = (ArmatureModifierData *) md;
-
-	if (amd->object) {
-		DagNode *curNode = dag_get_node(forest, amd->object);
-
-		dag_add_relation(forest, curNode, obNode,
-		                 DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Armature Modifier");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -221,7 +205,6 @@ ModifierTypeInfo modifierType_Armature = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index b049457e640..6017f964c26 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -101,40 +101,6 @@ static void foreachObjectLink(
 	walk(userData, ob, &amd->offset_ob, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob), DagNode *obNode)
-{
-	ArrayModifierData *amd = (ArrayModifierData *) md;
-
-	if (amd->start_cap) {
-		DagNode *curNode = dag_get_node(forest, amd->start_cap);
-
-		dag_add_relation(forest, curNode, obNode,
-		                 DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier");
-	}
-	if (amd->end_cap) {
-		DagNode *curNode = dag_get_node(forest, amd->end_cap);
-
-		dag_add_relation(forest, curNode, obNode,
-		                 DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier");
-	}
-	if (amd->curve_ob) {
-		DagNode *curNode = dag_get_node(forest, amd->curve_ob);
-		curNode->eval_flags |= DAG_EVAL_NEED_CURVE_PATH;
-
-		dag_add_relation(forest, curNode, obNode,
-		                 DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier");
-	}
-	if (amd->offset_ob) {
-		DagNode *curNode = dag_get_node(forest, amd->offset_ob);
-
-		dag_add_relation(forest, curNode, obNode,
-		                 DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Array Modifier");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *scene,
@@ -797,7 +763,6 @@ ModifierTypeInfo modifierType_Array = {
 	/* requiredDataMask */  NULL,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c
index 5874029ae08..17b0cd4d7f5 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -213,7 +213,6 @@ ModifierTypeInfo modifierType_Bevel = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */  dependsOnNormals,
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index da0f5aa3923..d2f19b78b50 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -104,22 +104,6 @@ static void foreachObjectLink(
 	walk(userData, ob, &bmd->object, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	BooleanModifierData *bmd = (BooleanModifierData *) md;
-
-	if (bmd->object) {
-		DagNode *curNode = dag_get_node(forest, bmd->object);
-
-		dag_add_relation(forest, curNode, obNode,
-		                 DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Boolean Modifier");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -459,7 +443,6 @@ ModifierTypeInfo modifierType_Boolean = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */  NULL,
diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c
index a364eef2974..d2467a8fc4a 100644
--- a/source/blender/modifiers/intern/MOD_build.c
+++ b/source/blender/modifiers/intern/MOD_build.c
@@ -322,7 +322,6 @@ ModifierTypeInfo modifierType_Build = {
 	/* requiredDataMask */  NULL,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     dependsOnTime,
 	/* dependsOnNormals */  NULL,
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c
index 2fe27730370..16c5de45c49 100644
--- a/source/blender/modifiers/intern/MOD_cast.c
+++ b/source/blender/modifiers/intern/MOD_cast.c
@@ -105,22 +105,6 @@ static void foreachObjectLink(
 	walk(userData, ob, &cmd->object, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	CastModifierData *cmd = (CastModifierData *) md;
-
-	if (cmd->object) {
-		DagNode *curNode = dag_get_node(forest, cmd->object);
-
-		dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA,
-		                 "Cast Modifier");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -513,7 +497,6 @@ ModifierTypeInfo modifierType_Cast = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c
index d15a6fcb1c8..b6a7b5b57ec 100644
--- a/source/blender/modifiers/intern/MOD_cloth.c
+++ b/source/blender/modifiers/intern/MOD_cloth.c
@@ -117,20 +117,6 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData,
 	dm->release(dm);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           Scene *scene, Object *ob, DagNode *obNode)
-{
-	ClothModifierData *clmd = (ClothModifierData *) md;
-	
-	if (clmd) {
-		/* Actual code uses get_collisionobjects */
-		dag_add_collision_relations(forest, scene, ob, obNode, clmd->coll_parms->group, ob->lay|scene->lay, eModifierType_Collision, NULL, true, "Cloth Collision");
-
-		dag_add_forcefield_relations(forest, scene, ob, obNode, clmd->sim_parms->effector_weights, true, 0, "Cloth Field");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *scene,
@@ -256,7 +242,6 @@ ModifierTypeInfo modifierType_Cloth = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          freeData,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     dependsOnTime,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c
index e7ff0a90fbc..a2a4b2e1274 100644
--- a/source/blender/modifiers/intern/MOD_collision.c
+++ b/source/blender/modifiers/intern/MOD_collision.c
@@ -265,7 +265,6 @@ ModifierTypeInfo modifierType_Collision = {
 	/* requiredDataMask */  NULL,
 	/* freeData */          freeData,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     dependsOnTime,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c
index 77fd84a2948..0718b0f85fa 100644
--- a/source/blender/modifiers/intern/MOD_correctivesmooth.c
+++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c
@@ -759,7 +759,6 @@ ModifierTypeInfo modifierType_CorrectiveSmooth = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          freeData,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */  NULL,
diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c
index 9bc96e593fd..3e9b46ad8ea 100644
--- a/source/blender/modifiers/intern/MOD_curve.c
+++ b/source/blender/modifiers/intern/MOD_curve.c
@@ -92,23 +92,6 @@ static void foreachObjectLink(
 	walk(userData, ob, &cmd->object, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	CurveModifierData *cmd = (CurveModifierData *) md;
-
-	if (cmd->object) {
-		DagNode *curNode = dag_get_node(forest, cmd->object);
-		curNode->eval_flags |= DAG_EVAL_NEED_CURVE_PATH;
-
-		dag_add_relation(forest, curNode, obNode,
-		                 DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Curve Modifier");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *scene,
@@ -178,7 +161,6 @@ ModifierTypeInfo modifierType_Curve = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */  NULL,
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c
index f5ab28d3d88..26952e1e0d5 100644
--- a/source/blender/modifiers/intern/MOD_datatransfer.c
+++ b/source/blender/modifiers/intern/MOD_datatransfer.c
@@ -127,22 +127,6 @@ static void foreachObjectLink(
 	walk(userData, ob, &dtmd->ob_source, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob), DagNode *obNode)
-{
-	DataTransferModifierData *dtmd = (DataTransferModifierData *) md;
-	DagNode *curNode;
-
-	if (dtmd->ob_source) {
-		curNode = dag_get_node(forest, dtmd->ob_source);
-
-		dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-		                 "DataTransfer Modifier");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -251,7 +235,6 @@ ModifierTypeInfo modifierType_DataTransfer = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */  dependsOnNormals,
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c
index 617ae5a89f3..bcb52e4e0ca 100644
--- a/source/blender/modifiers/intern/MOD_decimate.c
+++ b/source/blender/modifiers/intern/MOD_decimate.c
@@ -227,7 +227,6 @@ ModifierTypeInfo modifierType_Decimate = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index 059e096ddb4..4b5181e9c61 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -157,31 +157,6 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams))
 	return ((!dmd->texture && dmd->direction == MOD_DISP_DIR_RGB_XYZ) || dmd->strength == 0.0f);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	DisplaceModifierData *dmd = (DisplaceModifierData *) md;
-
-	if (dmd->map_object && dmd->texmapping == MOD_DISP_MAP_OBJECT) {
-		DagNode *curNode = dag_get_node(forest, dmd->map_object);
-
-		dag_add_relation(forest, curNode, obNode,
-		                 DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Displace Modifier");
-	}
-	
-
-	if (dmd->texmapping == MOD_DISP_MAP_GLOBAL ||
-	    (ELEM(dmd->direction, MOD_DISP_DIR_X, MOD_DISP_DIR_Y, MOD_DISP_DIR_Z, MOD_DISP_DIR_RGB_XYZ) &&
-	    dmd->space == MOD_DISP_SPACE_GLOBAL))
-	{
-		dag_add_relation(forest, obNode, obNode,
-		                 DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Displace Modifier");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -393,7 +368,6 @@ ModifierTypeInfo modifierType_Displace = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          freeData,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     dependsOnTime,
 	/* dependsOnNormals */	dependsOnNormals,
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c
index bde20e56748..ee6df153905 100644
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@@ -119,27 +119,6 @@ static bool is_brush_cb(Object *UNUSED(ob), ModifierData *pmd)
 	return ((DynamicPaintModifierData*)pmd)->brush != NULL;
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *scene,
-                           Object *ob,
-                           DagNode *obNode)
-{
-	DynamicPaintModifierData *pmd = (DynamicPaintModifierData *) md;
-
-	/* add relation from canvases to all brush objects */
-	if (pmd && pmd->canvas) {
-		for (DynamicPaintSurface *surface = pmd->canvas->surfaces.first; surface; surface = surface->next) {
-			if (surface->effect & MOD_DPAINT_EFFECT_DO_DRIP) {
-				dag_add_forcefield_relations(forest, scene, ob, obNode, surface->effector_weights, true, 0, "Dynamic Paint Field");
-			}
-
-			/* Actual code uses custom loop over group/scene without layer checks in dynamicPaint_doStep */
-			dag_add_collision_relations(forest, scene, ob, obNode, surface->brush_group, -1, eModifierType_DynamicPaint, is_brush_cb, false, "Dynamic Paint Brush");
-		}
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *scene,
@@ -214,7 +193,6 @@ ModifierTypeInfo modifierType_DynamicPaint = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          freeData,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     dependsOnTime,
 	/* dependsOnNormals */  NULL,
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c
index 4441edb299b..f239807a7d3 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -157,7 +157,6 @@ ModifierTypeInfo modifierType_EdgeSplit = {
 	/* requiredDataMask */  NULL,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c
index 38ffdaa709b..dea1f9d8d4c 100644
--- a/source/blender/modifiers/intern/MOD_explode.c
+++ b/source/blender/modifiers/intern/MOD_explode.c
@@ -1059,7 +1059,6 @@ ModifierTypeInfo modifierType_Explode = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          freeData,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     dependsOnTime,
 	/* dependsOnNormals */  NULL,
diff --git a/source/blender/modifiers/intern/MOD_fluidsim.c b/source/blender/modifiers/intern/MOD_fluidsim.c
index c202c5e1cb4..bed25fa82db 100644
--- a/source/blender/modifiers/intern/MOD_fluidsim.c
+++ b/source/blender/modifiers/intern/MOD_fluidsim.c
@@ -100,33 +100,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 	return result ? result : dm;
 }
 
-static void updateDepgraph(
-        ModifierData *md, DagForest *forest,
-        struct Main *UNUSED(bmain), Scene *scene,
-        Object *ob, DagNode *obNode)
-{
-	FluidsimModifierData *fluidmd = (FluidsimModifierData *) md;
-	Base *base;
-
-	if (fluidmd && fluidmd->fss) {
-		if (fluidmd->fss->type == OB_FLUIDSIM_DOMAIN) {
-			for (base = scene->base.first; base; base = base->next) {
-				Object *ob1 = base->object;
-				if (ob1 != ob) {
-					FluidsimModifierData *fluidmdtmp =
-					        (FluidsimModifierData *)modifiers_findByType(ob1, eModifierType_Fluidsim);
-					
-					/* only put dependencies from NON-DOMAIN fluids in here */
-					if (fluidmdtmp && fluidmdtmp->fss && (fluidmdtmp->fss->type != OB_FLUIDSIM_DOMAIN)) {
-						DagNode *curNode = dag_get_node(forest, ob1);
-						dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Fluidsim Object");
-					}
-				}
-			}
-		}
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *scene,
@@ -180,7 +153,6 @@ ModifierTypeInfo modifierType_Fluidsim = {
 	/* requiredDataMask */  NULL,
 	/* freeData */          freeData,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     dependsOnTime,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c
index 9186b10d8ca..13d94abc92d 100644
--- a/source/blender/modifiers/intern/MOD_hook.c
+++ b/source/blender/modifiers/intern/MOD_hook.c
@@ -118,24 +118,6 @@ static void foreachObjectLink(
 	walk(userData, ob, &hmd->object, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	HookModifierData *hmd = (HookModifierData *) md;
-
-	if (hmd->object) {
-		DagNode *curNode = dag_get_node(forest, hmd->object);
-		
-		if (hmd->subtarget[0])
-			dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA | DAG_RL_DATA_DATA, "Hook Modifier");
-		else
-			dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA, "Hook Modifier");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -427,7 +409,6 @@ ModifierTypeInfo modifierType_Hook = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          freeData,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.c b/source/blender/modifiers/intern/MOD_laplaciandeform.c
index ce3fdc4bbe8..56a2e217a2a 100644
--- a/source/blender/modifiers/intern/MOD_laplaciandeform.c
+++ b/source/blender/modifiers/intern/MOD_laplaciandeform.c
@@ -775,7 +775,6 @@ ModifierTypeInfo modifierType_LaplacianDeform = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          freeData,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c
index f1216ff462a..1295a75d9e7 100644
--- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c
+++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c
@@ -561,7 +561,6 @@ ModifierTypeInfo modifierType_LaplacianSmooth = {
 	/* requiredDataMask */  required_data_mask,
 	/* freeData */          NULL,
 	/* isDisabled */        is_disabled,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c
index 7d4701e3ef2..292c2db61f8 100644
--- a/source/blender/modifiers/intern/MOD_lattice.c
+++ b/source/blender/modifiers/intern/MOD_lattice.c
@@ -91,22 +91,6 @@ static void foreachObjectLink(
 	walk(userData, ob, &lmd->object, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	LatticeModifierData *lmd = (LatticeModifierData *) md;
-
-	if (lmd->object) {
-		DagNode *latNode = dag_get_node(forest, lmd->object);
-
-		dag_add_relation(forest, latNode, obNode,
-		                 DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Lattice Modifier");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -169,7 +153,6 @@ ModifierTypeInfo modifierType_Lattice = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c
index 5e01a20d93b..7cb2f2c25d5 100644
--- a/source/blender/modifiers/intern/MOD_mask.c
+++ b/source/blender/modifiers/intern/MOD_mask.c
@@ -77,24 +77,6 @@ static void foreachObjectLink(
 	walk(userData, ob, &mmd->ob_arm, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	MaskModifierData *mmd = (MaskModifierData *)md;
-
-	if (mmd->ob_arm) {
-		bArmature *arm = (bArmature *)mmd->ob_arm->data;
-		DagNode *armNode = dag_get_node(forest, mmd->ob_arm);
-		
-		/* tag relationship in depsgraph, but also on the armature */
-		dag_add_relation(forest, armNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Mask Modifier");
-		arm->flag |= ARM_HAS_VIZ_DEPS;
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -401,7 +383,6 @@ ModifierTypeInfo modifierType_Mask = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c
index aa3e3ebcf7e..0d96032c515 100644
--- a/source/blender/modifiers/intern/MOD_meshcache.c
+++ b/source/blender/modifiers/intern/MOD_meshcache.c
@@ -313,7 +313,6 @@ ModifierTypeInfo modifierType_MeshCache = {
 	/* requiredDataMask */  NULL,
 	/* freeData */          NULL,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     dependsOnTime,
 	/* dependsOnNormals */  NULL,
diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c
index 3f34319d25f..27782b05cd2 100644
--- a/source/blender/modifiers/intern/MOD_meshdeform.c
+++ b/source/blender/modifiers/intern/MOD_meshdeform.c
@@ -122,23 +122,6 @@ static void foreachObjectLink(
 	walk(userData, ob, &mmd->object, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	MeshDeformModifierData *mmd = (MeshDeformModifierData *) md;
-
-	if (mmd->object) {
-		DagNode *curNode = dag_get_node(forest, mmd->object);
-
-		dag_add_relation(forest, curNode, obNode,
-		                 DAG_RL_DATA_DATA | DAG_RL_OB_DATA | DAG_RL_DATA_OB | DAG_RL_OB_OB,
-		                 "Mesh Deform Modifier");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -534,7 +517,6 @@ ModifierTypeInfo modifierType_MeshDeform = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          freeData,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */  NULL,
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c
index 2f00a7c71b0..985c365bb69 100644
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@ -155,23 +155,6 @@ static void foreachIDLink(ModifierData *md, Object *ob,
 }
 
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *bmain,
-                           struct Scene *scene,
-                           Object *ob, DagNode *obNode)
-{
-	MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *) md;
-
-	if (mcmd->cache_file != NULL) {
-		DagNode *curNode = dag_get_node(forest, mcmd->cache_file);
-
-		dag_add_relation(forest, curNode, obNode,
-		                 DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Cache File Modifier");
-	}
-
-	UNUSED_VARS(bmain, scene, ob);
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *bmain,
                             struct Scene *scene,
@@ -205,7 +188,6 @@ ModifierTypeInfo modifierType_MeshSequenceCache = {
     /* requiredDataMask */  NULL,
     /* freeData */          freeData,
     /* isDisabled */        isDisabled,
-    /* updateDepgraph */    updateDepgraph,
     /* updateDepsgraph */   updateDepsgraph,
     /* dependsOnTime */     dependsOnTime,
     /* dependsOnNormals */  NULL,
diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c
index 88facb22e0e..9fdd75aeb68 100644
--- a/source/blender/modifiers/intern/MOD_mirror.c
+++ b/source/blender/modifiers/intern/MOD_mirror.c
@@ -75,21 +75,6 @@ static void foreachObjectLink(
 	walk(userData, ob, &mmd->mirror_ob, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	MirrorModifierData *mmd = (MirrorModifierData *) md;
-
-	if (mmd->mirror_ob) {
-		DagNode *latNode = dag_get_node(forest, mmd->mirror_ob);
-
-		dag_add_relation(forest, latNode, obNode, DAG_RL_OB_DATA, "Mirror Modifier");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -375,7 +360,6 @@ ModifierTypeInfo modifierType_Mirror = {
 	/* requiredDataMask */  NULL,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c
index 90ad1bdfdc2..aba184b7d40 100644
--- a/source/blender/modifiers/intern/MOD_multires.c
+++ b/source/blender/modifiers/intern/MOD_multires.c
@@ -161,7 +161,6 @@ ModifierTypeInfo modifierType_Multires = {
 	/* requiredDataMask */  NULL,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_none.c b/source/blender/modifiers/intern/MOD_none.c
index d9d9ba2966d..3fb780f566d 100644
--- a/source/blender/modifiers/intern/MOD_none.c
+++ b/source/blender/modifiers/intern/MOD_none.c
@@ -67,7 +67,6 @@ ModifierTypeInfo modifierType_None = {
 	/* requiredDataMask */  NULL,
 	/* freeData */          NULL,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_normal_edit.c b/source/blender/modifiers/intern/MOD_normal_edit.c
index 454c97451a8..eefca658305 100644
--- a/source/blender/modifiers/intern/MOD_normal_edit.c
+++ b/source/blender/modifiers/intern/MOD_normal_edit.c
@@ -511,20 +511,6 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams))
 	return !is_valid_target(enmd);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob), DagNode *obNode)
-{
-	NormalEditModifierData *enmd = (NormalEditModifierData *) md;
-
-	if (enmd->target) {
-		DagNode *Node = dag_get_node(forest, enmd->target);
-
-		dag_add_relation(forest, Node, obNode, DAG_RL_OB_DATA, "NormalEdit Modifier");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -562,7 +548,6 @@ ModifierTypeInfo modifierType_NormalEdit = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */  dependsOnNormals,
diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c
index e77cc655c16..1be603c7ab5 100644
--- a/source/blender/modifiers/intern/MOD_ocean.c
+++ b/source/blender/modifiers/intern/MOD_ocean.c
@@ -597,7 +597,6 @@ ModifierTypeInfo modifierType_Ocean = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          freeData,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	dependsOnNormals,
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c
index 4e78e758dc3..a468cc6600d 100644
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@@ -110,24 +110,6 @@ static bool isDisabled(ModifierData *md, int useRenderParams)
 	return false;
 }
 
-
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	ParticleInstanceModifierData *pimd = (ParticleInstanceModifierData *) md;
-
-	if (pimd->ob) {
-		DagNode *curNode = dag_get_node(forest, pimd->ob);
-
-		dag_add_relation(forest, curNode, obNode,
-		                 DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-		                 "Particle Instance Modifier");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -460,7 +442,6 @@ ModifierTypeInfo modifierType_ParticleInstance = {
 	/* requiredDataMask */  NULL,
 	/* freeData */          NULL,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */  NULL,
diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c
index d8cccca415c..a3b9d808b17 100644
--- a/source/blender/modifiers/intern/MOD_particlesystem.c
+++ b/source/blender/modifiers/intern/MOD_particlesystem.c
@@ -231,7 +231,6 @@ ModifierTypeInfo modifierType_ParticleSystem = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          freeData,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c
index b85898c07e9..fb5c12399a4 100644
--- a/source/blender/modifiers/intern/MOD_remesh.c
+++ b/source/blender/modifiers/intern/MOD_remesh.c
@@ -231,7 +231,6 @@ ModifierTypeInfo modifierType_Remesh = {
 	/* requiredDataMask */  NULL,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c
index 290e19736bb..a834d1b5cae 100644
--- a/source/blender/modifiers/intern/MOD_screw.c
+++ b/source/blender/modifiers/intern/MOD_screw.c
@@ -1057,24 +1057,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 	return result;
 }
 
-
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	ScrewModifierData *ltmd = (ScrewModifierData *) md;
-
-	if (ltmd->ob_axis) {
-		DagNode *curNode = dag_get_node(forest, ltmd->ob_axis);
-
-		dag_add_relation(forest, curNode, obNode,
-		                 DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-		                 "Screw Modifier");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -1118,7 +1100,6 @@ ModifierTypeInfo modifierType_Screw = {
 	/* requiredDataMask */  NULL,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c
index 97aae733532..6c8bd06c196 100644
--- a/source/blender/modifiers/intern/MOD_shapekey.c
+++ b/source/blender/modifiers/intern/MOD_shapekey.c
@@ -138,7 +138,6 @@ ModifierTypeInfo modifierType_ShapeKey = {
 	/* requiredDataMask */  NULL,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c
index 633311c2b87..29bce2ef3a4 100644
--- a/source/blender/modifiers/intern/MOD_shrinkwrap.c
+++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c
@@ -143,23 +143,6 @@ static void deformVertsEM(ModifierData *md, Object *ob, struct BMEditMesh *editD
 		dm->release(dm);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	ShrinkwrapModifierData *smd = (ShrinkwrapModifierData *) md;
-
-	if (smd->target)
-		dag_add_relation(forest, dag_get_node(forest, smd->target), obNode,
-		                 DAG_RL_OB_DATA | DAG_RL_DATA_DATA, "Shrinkwrap Modifier");
-
-	if (smd->auxTarget)
-		dag_add_relation(forest, dag_get_node(forest, smd->auxTarget), obNode,
-		                 DAG_RL_OB_DATA | DAG_RL_DATA_DATA, "Shrinkwrap Modifier");
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -209,7 +192,6 @@ ModifierTypeInfo modifierType_Shrinkwrap = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */  dependsOnNormals,
diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c
index c68f2651191..118d0117361 100644
--- a/source/blender/modifiers/intern/MOD_simpledeform.c
+++ b/source/blender/modifiers/intern/MOD_simpledeform.c
@@ -293,18 +293,6 @@ static void foreachObjectLink(
 	walk(userData, ob, &smd->origin, IDWALK_NOP);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	SimpleDeformModifierData *smd  = (SimpleDeformModifierData *)md;
-
-	if (smd->origin)
-		dag_add_relation(forest, dag_get_node(forest, smd->origin), obNode, DAG_RL_OB_DATA, "SimpleDeform Modifier");
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -381,7 +369,6 @@ ModifierTypeInfo modifierType_SimpleDeform = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c
index 8ed623734be..4b84aeb335a 100644
--- a/source/blender/modifiers/intern/MOD_skin.c
+++ b/source/blender/modifiers/intern/MOD_skin.c
@@ -1950,7 +1950,6 @@ ModifierTypeInfo modifierType_Skin = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c
index f04d7432a8f..637ed3ee390 100644
--- a/source/blender/modifiers/intern/MOD_smoke.c
+++ b/source/blender/modifiers/intern/MOD_smoke.c
@@ -129,22 +129,6 @@ static bool is_coll_cb(Object *UNUSED(ob), ModifierData *md)
 	return (smd->type & MOD_SMOKE_TYPE_COLL) && smd->coll;
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *scene, struct Object *ob,
-                           DagNode *obNode)
-{
-	SmokeModifierData *smd = (SmokeModifierData *) md;
-
-	if (smd && (smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) {
-		/* Actual code uses get_collisionobjects */
-		dag_add_collision_relations(forest, scene, ob, obNode, smd->domain->fluid_group, ob->lay|scene->lay, eModifierType_Smoke, is_flow_cb, true, "Smoke Flow");
-		dag_add_collision_relations(forest, scene, ob, obNode, smd->domain->coll_group, ob->lay|scene->lay, eModifierType_Smoke, is_coll_cb, true, "Smoke Coll");
-
-		dag_add_forcefield_relations(forest, scene, ob, obNode, smd->domain->effector_weights, true, PFIELD_SMOKEFLOW, "Smoke Force Field");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *scene,
@@ -202,7 +186,6 @@ ModifierTypeInfo modifierType_Smoke = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          freeData,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     dependsOnTime,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c
index d45c8528510..f0f20acb8ea 100644
--- a/source/blender/modifiers/intern/MOD_smooth.c
+++ b/source/blender/modifiers/intern/MOD_smooth.c
@@ -261,7 +261,6 @@ ModifierTypeInfo modifierType_Smooth = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_softbody.c b/source/blender/modifiers/intern/MOD_softbody.c
index 17adc7f1520..412f0a3ce53 100644
--- a/source/blender/modifiers/intern/MOD_softbody.c
+++ b/source/blender/modifiers/intern/MOD_softbody.c
@@ -62,18 +62,6 @@ static bool dependsOnTime(ModifierData *UNUSED(md))
 	return true;
 }
 
-static void updateDepgraph(ModifierData *UNUSED(md), DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           Scene *scene, Object *ob, DagNode *obNode)
-{
-	if (ob->soft) {
-		/* Actual code uses ccd_build_deflector_hash */
-		dag_add_collision_relations(forest, scene, ob, obNode, ob->soft->collision_group, ob->lay, eModifierType_Collision, NULL, false, "Softbody Collision");
-
-		dag_add_forcefield_relations(forest, scene, ob, obNode, ob->soft->effector_weights, true, 0, "Softbody Field");
-	}
-}
-
 static void updateDepsgraph(ModifierData *UNUSED(md),
                             struct Main *UNUSED(bmain),
                             struct Scene *scene,
@@ -109,7 +97,6 @@ ModifierTypeInfo modifierType_Softbody = {
 	/* requiredDataMask */  NULL,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     dependsOnTime,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c
index 911b6997058..e589cb7d713 100644
--- a/source/blender/modifiers/intern/MOD_solidify.c
+++ b/source/blender/modifiers/intern/MOD_solidify.c
@@ -973,7 +973,6 @@ ModifierTypeInfo modifierType_Solidify = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */  dependsOnNormals,
diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c
index 8711384e1ee..af3ffb820c1 100644
--- a/source/blender/modifiers/intern/MOD_subsurf.c
+++ b/source/blender/modifiers/intern/MOD_subsurf.c
@@ -211,7 +211,6 @@ ModifierTypeInfo modifierType_Subsurf = {
 	/* requiredDataMask */  NULL,
 	/* freeData */          freeData,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	dependsOnNormals,
diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c
index 68987a1d28e..fc02a2e1327 100644
--- a/source/blender/modifiers/intern/MOD_surface.c
+++ b/source/blender/modifiers/intern/MOD_surface.c
@@ -185,7 +185,6 @@ ModifierTypeInfo modifierType_Surface = {
 	/* requiredDataMask */  NULL,
 	/* freeData */          freeData,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     dependsOnTime,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_triangulate.c b/source/blender/modifiers/intern/MOD_triangulate.c
index 6fad2756f82..a5d826a69ba 100644
--- a/source/blender/modifiers/intern/MOD_triangulate.c
+++ b/source/blender/modifiers/intern/MOD_triangulate.c
@@ -118,7 +118,6 @@ ModifierTypeInfo modifierType_Triangulate = {
 	/* requiredDataMask */  NULL, //requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c
index fb7668d16e0..54c25b687e1 100644
--- a/source/blender/modifiers/intern/MOD_uvproject.c
+++ b/source/blender/modifiers/intern/MOD_uvproject.c
@@ -105,25 +105,6 @@ static void foreachIDLink(ModifierData *md, Object *ob,
 	foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData);
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	UVProjectModifierData *umd = (UVProjectModifierData *) md;
-	int i;
-
-	for (i = 0; i < umd->num_projectors; ++i) {
-		if (umd->projectors[i]) {
-			DagNode *curNode = dag_get_node(forest, umd->projectors[i]);
-
-			dag_add_relation(forest, curNode, obNode,
-			                 DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "UV Project Modifier");
-		}
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -385,7 +366,6 @@ ModifierTypeInfo modifierType_UVProject = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_uvwarp.c b/source/blender/modifiers/intern/MOD_uvwarp.c
index 89994c3ae22..2ac6892b7b8 100644
--- a/source/blender/modifiers/intern/MOD_uvwarp.c
+++ b/source/blender/modifiers/intern/MOD_uvwarp.c
@@ -238,18 +238,6 @@ static void uv_warp_deps_object_bone(DagForest *forest, DagNode *obNode,
 	}
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	UVWarpModifierData *umd = (UVWarpModifierData *) md;
-
-	uv_warp_deps_object_bone(forest, obNode, umd->object_src, umd->bone_src);
-	uv_warp_deps_object_bone(forest, obNode, umd->object_dst, umd->bone_dst);
-}
-
 static void uv_warp_deps_object_bone_new(struct DepsNodeHandle *node,
                                          Object *object,
                                          const char *bonename)
@@ -293,7 +281,6 @@ ModifierTypeInfo modifierType_UVWarp = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */  NULL,
diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c
index b38de140a91..13ce72ee2f5 100644
--- a/source/blender/modifiers/intern/MOD_warp.c
+++ b/source/blender/modifiers/intern/MOD_warp.c
@@ -135,27 +135,6 @@ static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void
 	walk(userData, ob, md, "texture");
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob), DagNode *obNode)
-{
-	WarpModifierData *wmd = (WarpModifierData *) md;
-
-	if (wmd->object_from && wmd->object_to) {
-		DagNode *fromNode = dag_get_node(forest, wmd->object_from);
-		DagNode *toNode = dag_get_node(forest, wmd->object_to);
-
-		dag_add_relation(forest, fromNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Warp Modifier1");
-		dag_add_relation(forest, toNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Warp Modifier2");
-	}
-
-	if ((wmd->texmapping == MOD_DISP_MAP_OBJECT) && wmd->map_object) {
-		DagNode *curNode = dag_get_node(forest, wmd->map_object);
-		dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Warp Modifier3");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -387,7 +366,6 @@ ModifierTypeInfo modifierType_Warp = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          freeData,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     dependsOnTime,
 	/* dependsOnNormals */  NULL,
diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c
index 683649ed1c0..291913675c3 100644
--- a/source/blender/modifiers/intern/MOD_wave.c
+++ b/source/blender/modifiers/intern/MOD_wave.c
@@ -131,29 +131,6 @@ static void foreachTexLink(ModifierData *md, Object *ob,
 	walk(userData, ob, md, "texture");
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           Scene *UNUSED(scene),
-                           Object *UNUSED(ob),
-                           DagNode *obNode)
-{
-	WaveModifierData *wmd = (WaveModifierData *) md;
-
-	if (wmd->objectcenter) {
-		DagNode *curNode = dag_get_node(forest, wmd->objectcenter);
-
-		dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA,
-		                 "Wave Modifier");
-	}
-
-	if (wmd->map_object) {
-		DagNode *curNode = dag_get_node(forest, wmd->map_object);
-
-		dag_add_relation(forest, curNode, obNode, DAG_RL_OB_DATA,
-		                 "Wave Modifer");
-	}
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -397,7 +374,6 @@ ModifierTypeInfo modifierType_Wave = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          freeData,
 	/* isDisabled */        NULL,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     dependsOnTime,
 	/* dependsOnNormals */	NULL,
diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.c b/source/blender/modifiers/intern/MOD_weightvgedit.c
index 93567aed2c4..585b223d436 100644
--- a/source/blender/modifiers/intern/MOD_weightvgedit.c
+++ b/source/blender/modifiers/intern/MOD_weightvgedit.c
@@ -143,26 +143,6 @@ static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void
 	walk(userData, ob, md, "mask_texture");
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob), DagNode *obNode)
-{
-	WeightVGEditModifierData *wmd = (WeightVGEditModifierData *) md;
-	DagNode *curNode;
-
-	if (wmd->mask_tex_map_obj && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) {
-		curNode = dag_get_node(forest, wmd->mask_tex_map_obj);
-
-		dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-		                 "WeightVGEdit Modifier");
-	}
-
-	if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL)
-		dag_add_relation(forest, obNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-		                 "WeightVGEdit Modifier");
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -307,7 +287,6 @@ ModifierTypeInfo modifierType_WeightVGEdit = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          freeData,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     dependsOnTime,
 	/* dependsOnNormals */  NULL,
diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c
index 170fbbed7f1..a6adf72e4eb 100644
--- a/source/blender/modifiers/intern/MOD_weightvgmix.c
+++ b/source/blender/modifiers/intern/MOD_weightvgmix.c
@@ -192,26 +192,6 @@ static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void
 	walk(userData, ob, md, "mask_texture");
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob), DagNode *obNode)
-{
-	WeightVGMixModifierData *wmd = (WeightVGMixModifierData *) md;
-	DagNode *curNode;
-
-	if (wmd->mask_tex_map_obj && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) {
-		curNode = dag_get_node(forest, wmd->mask_tex_map_obj);
-
-		dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-		                 "WeightVGMix Modifier");
-	}
-
-	if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL)
-		dag_add_relation(forest, obNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-		                 "WeightVGMix Modifier");
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -439,7 +419,6 @@ ModifierTypeInfo modifierType_WeightVGMix = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          freeData,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     dependsOnTime,
 	/* dependsOnNormals */  NULL,
diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c
index af59f11ba15..b26cbc3a7d3 100644
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@@ -343,32 +343,6 @@ static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void
 	walk(userData, ob, md, "mask_texture");
 }
 
-static void updateDepgraph(ModifierData *md, DagForest *forest,
-                           struct Main *UNUSED(bmain),
-                           struct Scene *UNUSED(scene),
-                           Object *UNUSED(ob), DagNode *obNode)
-{
-	WeightVGProximityModifierData *wmd = (WeightVGProximityModifierData *) md;
-	DagNode *curNode;
-
-	if (wmd->proximity_ob_target) {
-		curNode = dag_get_node(forest, wmd->proximity_ob_target);
-		dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-		                 "WeightVGProximity Modifier");
-	}
-
-	if (wmd->mask_tex_map_obj && wmd->mask_tex_mapping == MOD_DISP_MAP_OBJECT) {
-		curNode = dag_get_node(forest, wmd->mask_tex_map_obj);
-
-		dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-		                 "WeightVGProximity Modifier");
-	}
-
-	if (wmd->mask_tex_mapping == MOD_DISP_MAP_GLOBAL)
-		dag_add_relation(forest, obNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA,
-		                 "WeightVGProximity Modifier");
-}
-
 static void updateDepsgraph(ModifierData *md,
                             struct Main *UNUSED(bmain),
                             struct Scene *UNUSED(scene),
@@ -617,7 +591,6 @@ ModifierTypeInfo modifierType_WeightVGProximity = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          freeData,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    updateDepgraph,
 	/* updateDepsgraph */   updateDepsgraph,
 	/* dependsOnTime */     dependsOnTime,
 	/* dependsOnNormals */  NULL,
diff --git a/source/blender/modifiers/intern/MOD_wireframe.c b/source/blender/modifiers/intern/MOD_wireframe.c
index adadd4834d4..0c295f91012 100644
--- a/source/blender/modifiers/intern/MOD_wireframe.c
+++ b/source/blender/modifiers/intern/MOD_wireframe.c
@@ -132,7 +132,6 @@ ModifierTypeInfo modifierType_Wireframe = {
 	/* requiredDataMask */  requiredDataMask,
 	/* freeData */          NULL,
 	/* isDisabled */        isDisabled,
-	/* updateDepgraph */    NULL,
 	/* updateDepsgraph */   NULL,
 	/* dependsOnTime */     NULL,
 	/* dependsOnNormals */  dependsOnNormals,
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 7c68a0ce438..a8abc3bb54f 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1850,7 +1850,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
 	             BLENDER_VERSION / 100, BLENDER_VERSION % 100);
 	uiItemStringO(col, IFACE_("Release Log"), ICON_URL, "WM_OT_url_open", "url", url);
 	uiItemStringO(col, IFACE_("Manual"), ICON_URL, "WM_OT_url_open", "url",
-	              "http://www.blender.org/manual");
+	              "https://docs.blender.org/manual/en/dev/");
 	uiItemStringO(col, IFACE_("Blender Website"), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org");
 	if (STREQ(STRINGIFY(BLENDER_VERSION_CYCLE), "release")) {
 		BLI_snprintf(url, sizeof(url), "http://www.blender.org/documentation/blender_python_api_%d_%d"
@@ -4603,4 +4603,3 @@ EnumPropertyItem *RNA_mask_local_itemf(bContext *C, PointerRNA *ptr, PropertyRNA
 {
 	return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->mask.first : NULL, true);
 }
-
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index 06119b35e37..3b6cd1c9561 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -55,8 +55,6 @@
 #include "BKE_sound.h"
 #include "BKE_image.h"
 
-#include "DEG_depsgraph.h"
-
 #ifdef WITH_FFMPEG
 #include "IMB_imbuf.h"
 #endif
@@ -438,7 +436,7 @@ static void arg_py_context_restore(
  *   see: `doc/manpage/blender.1.py`
  * - Parsed and extracted for the manual,
  *   which converts our ad-hoc formatting to reStructuredText.
- *   see: http://www.blender.org/manual/advanced/command_line.html
+ *   see: https://docs.blender.org/manual/en/dev/advanced/command_line.html
  *
  * \{ */
 
@@ -587,7 +585,6 @@ static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), vo
 
 	printf("\n");
 	printf("Experimental Features:\n");
-	BLI_argsPrintArgDoc(ba, "--enable-new-depsgraph");
 	BLI_argsPrintArgDoc(ba, "--enable-new-basic-shader-glsl");
 
 	/* Other options _must_ be last (anything not handled will show here) */
@@ -1185,16 +1182,6 @@ static int arg_handle_threads_set(int argc, const char **argv, void *UNUSED(data
 	}
 }
 
-static const char arg_handle_depsgraph_use_new_doc[] =
-"\n\tUse new dependency graph"
-;
-static int arg_handle_depsgraph_use_new(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
-{
-	printf("Using new dependency graph.\n");
-	DEG_depsgraph_switch_to_new();
-	return 0;
-}
-
 static const char arg_handle_basic_shader_use_legacy_doc[] =
 "\n\tUse legacy (non-GLSL) basic shader"
 ;
@@ -1840,7 +1827,6 @@ void main_args_setup(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle)
 	BLI_argsAdd(ba, 1, NULL, "--debug-gpumem",
 	            CB_EX(arg_handle_debug_mode_generic_set, gpumem), (void *)G_DEBUG_GPU_MEM);
 
-	BLI_argsAdd(ba, 1, NULL, "--enable-new-depsgraph", CB(arg_handle_depsgraph_use_new), NULL);
 	BLI_argsAdd(ba, 1, NULL, "--enable-legacy-basic-shader", CB(arg_handle_basic_shader_use_legacy), NULL);
 
 	BLI_argsAdd(ba, 1, NULL, "--verbose", CB(arg_handle_verbosity_set), NULL);
diff --git a/source/tools b/source/tools
-Subproject 896c5f78952adb2d091d28c65086d46992dabda
+Subproject 6bbb68073bfa11e94bb0b3623db38f847037add