Depsgraph: Cleanup, reduce indentation level

2 files changed, 42 insertions, 39 deletions

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 26b3460e741..166df70d8d7 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -959,27 +959,28 @@ void DepsgraphNodeBuilder::build_nodetree(bNodeTree *ntree)
 	/* nodetree's nodes... */
 	LINKLIST_FOREACH (bNode *, bnode, &ntree->nodes) {
 		ID *id = bnode->id;
-		if (id != NULL) {
-			ID_Type id_type = GS(id->name);
-			if (id_type == ID_MA) {
-				build_material((Material *)id);
-			}
-			else if (id_type == ID_TE) {
-				build_texture((Tex *)id);
-			}
-			else if (id_type == ID_IM) {
-				build_image((Image *)id);
-			}
-			else if (bnode->type == NODE_GROUP) {
-				bNodeTree *group_ntree = (bNodeTree *)id;
-				if ((group_ntree->id.tag & LIB_TAG_DOIT) == 0) {
-					build_nodetree(group_ntree);
-				}
-			}
-			else {
-				BLI_assert(!"Unknown ID type used for node");
+		if (id == NULL) {
+			continue;
+		}
+		ID_Type id_type = GS(id->name);
+		if (id_type == ID_MA) {
+			build_material((Material *)id);
+		}
+		else if (id_type == ID_TE) {
+			build_texture((Tex *)id);
+		}
+		else if (id_type == ID_IM) {
+			build_image((Image *)id);
+		}
+		else if (bnode->type == NODE_GROUP) {
+			bNodeTree *group_ntree = (bNodeTree *)id;
+			if ((group_ntree->id.tag & LIB_TAG_DOIT) == 0) {
+				build_nodetree(group_ntree);
 			}
 		}
+		else {
+			BLI_assert(!"Unknown ID type used for node");
+		}
 	}
 
 	// TODO: link from nodetree to owner_component?
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index f0368998796..4a6e0765069 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1718,27 +1718,29 @@ void DepsgraphRelationBuilder::build_nodetree(bNodeTree *ntree)
 
 	/* nodetree's nodes... */
 	LINKLIST_FOREACH (bNode *, bnode, &ntree->nodes) {
-		if (bnode->id) {
-			if (GS(bnode->id->name) == ID_MA) {
-				build_material((Material *)bnode->id);
-			}
-			else if (bnode->type == ID_TE) {
-				build_texture((Tex *)bnode->id);
-			}
-			else if (bnode->type == NODE_GROUP) {
-				bNodeTree *group_ntree = (bNodeTree *)bnode->id;
-				if ((group_ntree->id.tag & LIB_TAG_DOIT) == 0) {
-					build_nodetree(group_ntree);
-					group_ntree->id.tag |= LIB_TAG_DOIT;
-				}
-				OperationKey group_parameters_key(&group_ntree->id,
-				                                  DEG_NODE_TYPE_PARAMETERS,
-				                                  DEG_OPCODE_PARAMETERS_EVAL);
-				add_relation(group_parameters_key, parameters_key, "Group Node");
-			}
-			else {
-				BLI_assert(!"Unknown ID type used for node");
+		ID *id = bnode->id;
+		if (id == NULL) {
+			continue;
+		}
+		if (GS(id->name) == ID_MA) {
+			build_material((Material *)bnode->id);
+		}
+		else if (bnode->type == ID_TE) {
+			build_texture((Tex *)bnode->id);
+		}
+		else if (bnode->type == NODE_GROUP) {
+			bNodeTree *group_ntree = (bNodeTree *)id;
+			if ((group_ntree->id.tag & LIB_TAG_DOIT) == 0) {
+				build_nodetree(group_ntree);
+				group_ntree->id.tag |= LIB_TAG_DOIT;
 			}
+			OperationKey group_parameters_key(&group_ntree->id,
+			                                  DEG_NODE_TYPE_PARAMETERS,
+			                                  DEG_OPCODE_PARAMETERS_EVAL);
+			add_relation(group_parameters_key, parameters_key, "Group Node");
+		}
+		else {
+			BLI_assert(!"Unknown ID type used for node");
 		}
 	}