[Bf-blender-cvs] [be05abc86af] master: Depsgraph: Add some sanity checks to ensure valid relations

[Sergey Sharybin]

Commit: be05abc86af49e1f5d6947c01a47ba59586ebf50
Author: Sergey Sharybin
Date:   Fri Feb 1 10:22:24 2019 +0100
Branches: master
https://developer.blender.org/rBbe05abc86af49e1f5d6947c01a47ba59586ebf50

Depsgraph: Add some sanity checks to ensure valid relations

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

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 aee61e22ebc..c96ccbc3696 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -912,23 +912,21 @@ void DepsgraphRelationBuilder::build_object_pointcache(Object *object)
 	int handled_components = 0;
 	LISTBASE_FOREACH (PTCacheID *, ptcache_id, &ptcache_id_list) {
 		/* Check which components needs the point cache. */
-		int flag;
+		int flag = -1;
 		if (ptcache_id->type == PTCACHE_TYPE_RIGIDBODY) {
 			flag = FLAG_TRANSFORM;
-			ComponentKey transform_key(&object->id,
-			                           NodeType::TRANSFORM);
+			ComponentKey transform_key(&object->id, NodeType::TRANSFORM);
 			add_relation(point_cache_key,
 			             transform_key,
 			             "Point Cache -> Rigid Body");
 		}
 		else {
 			flag = FLAG_GEOMETRY;
-			ComponentKey geometry_key(&object->id,
-			                           NodeType::GEOMETRY);
-			add_relation(point_cache_key,
-			             geometry_key,
-			             "Point Cache -> Geometry");
+			ComponentKey geometry_key(&object->id, NodeType::GEOMETRY);
+			add_relation(
+			        point_cache_key, geometry_key, "Point Cache -> Geometry");
 		}
+		BLI_assert(flag != -1);
 		/* Tag that we did handle that component. */
 		handled_components |= flag;
 		if (handled_components == FLAG_ALL) {