[Bf-blender-cvs] [d5dbe0c5666] blender-v2.79a-release: Fix T52741: Follow track with depth object crashes Blender with new depsgraph

[Sergey Sharybin]

Commit: d5dbe0c566665bb7d5e7b468154b12a5474329d5
Author: Sergey Sharybin
Date:   Thu Sep 14 12:31:54 2017 +0500
Branches: blender-v2.79a-release
https://developer.blender.org/rBd5dbe0c566665bb7d5e7b468154b12a5474329d5

Fix T52741: Follow track with depth object crashes Blender with new depsgraph

===================================================================

M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc

===================================================================

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index cee10a88900..9e1ffcaa20f 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -687,9 +687,12 @@ void DepsgraphRelationBuilder::build_constraints(Scene *scene, ID *id, eDepsNode
 					depends_on_camera = true;
 
 				if (data->depth_ob) {
-					// DAG_RL_DATA_OB | DAG_RL_OB_OB
-					ComponentKey depth_key(&data->depth_ob->id, DEG_NODE_TYPE_TRANSFORM);
-					add_relation(depth_key, constraint_op_key, cti->name);
+					ComponentKey depth_transform_key(&data->depth_ob->id,
+					                                 DEG_NODE_TYPE_TRANSFORM);
+					ComponentKey depth_geometry_key(&data->depth_ob->id,
+					                                DEG_NODE_TYPE_GEOMETRY);
+					add_relation(depth_transform_key, constraint_op_key, cti->name);
+					add_relation(depth_geometry_key, constraint_op_key, cti->name);
 				}
 			}
 			else if (cti->type == CONSTRAINT_TYPE_OBJECTSOLVER) {