Cleanup: style, duplicate includes

7 files changed, 10 insertions, 11 deletions

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer.cc
index 3ce0947a7b8..b3a88d8ac4d 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer.cc
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
+/** \file blender/depsgraph/intern/builder/deg_builder_nodes_layer.cc
  *  \ingroup depsgraph
  *
  * Methods for constructing depsgraph's nodes
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 6d31ca33988..0c5150f2f42 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1413,7 +1413,8 @@ void DepsgraphRelationBuilder::build_particles(Scene *scene, Object *ob)
 		}
 		else if ((psys->flag & PSYS_HAIR_DYNAMICS) &&
 		         psys->clmd != NULL &&
-		         psys->clmd->coll_parms != NULL) {
+		         psys->clmd->coll_parms != NULL)
+		{
 			add_collision_relations(psys_key,
 			                        scene,
 			                        ob,
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_layer.cc
index a6c9fdfc6bc..1e57a98d6f7 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_layer.cc
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
+/** \file blender/depsgraph/intern/builder/deg_builder_relations_layer.cc
  *  \ingroup depsgraph
  *
  * Methods for constructing depsgraph
diff --git a/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc b/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
index ba1b91629db..ce3a4182a0f 100644
--- a/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
+++ b/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
@@ -88,7 +88,7 @@ static const int deg_debug_node_type_color_map[][2] = {
     {DEG_NODE_TYPE_GEOMETRY,          6},
     {DEG_NODE_TYPE_SEQUENCER,         7},
     {DEG_NODE_TYPE_SHADING,           8},
-    {DEG_NODE_TYPE_SHADING_PARAMETERS,9},
+    {DEG_NODE_TYPE_SHADING_PARAMETERS, 9},
     {DEG_NODE_TYPE_CACHE,             10},
     {DEG_NODE_TYPE_LAYER_COLLECTIONS, 11},
     {DEG_NODE_TYPE_COPY_ON_WRITE,     12},
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc
index 9f25fcaaa32..81a4f2bc0cc 100644
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@ -296,7 +296,8 @@ IDDepsNode *Depsgraph::add_id_node(ID *id, bool do_tag, ID *id_cow_hint)
 		 * referencing to.
 		 */
 		BLI_ghash_insert(id_hash, id, id_node);
-	} else if (do_tag) {
+	}
+	else if (do_tag) {
 		id->tag |= LIB_TAG_DOIT;
 	}
 	return id_node;
diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc
index 0d06cc48b88..9e9a2c38993 100644
--- a/source/blender/depsgraph/intern/depsgraph_query.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query.cc
@@ -225,9 +225,8 @@ void DEG_objects_iterator_next(BLI_Iterator *iter)
 		BLI_assert(!BLI_listbase_is_empty(&base->collection_properties->data.group));
 
 		/* Flushing depsgraph data. */
-		deg_flush_base_flags_and_settings(ob,
-										  base,
-										  data->base_flag);
+		deg_flush_base_flags_and_settings(
+		        ob, base, data->base_flag);
 
 		if ((data->flag & DEG_OBJECT_ITER_FLAG_DUPLI) && (ob->transflag & OB_DUPLI)) {
 			data->dupli_parent = ob;
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index bd1d0dc0504..03be601ce2c 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -25,7 +25,7 @@
  */
 
 
-/** \file blender/depsgraph/intern/eval/deg_eval_copy_on_write.h
+/** \file blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
  *  \ingroup depsgraph
  */
 
@@ -65,9 +65,7 @@ extern "C" {
 #  include "DNA_lamp_types.h"
 #  include "DNA_linestyle_types.h"
 #  include "DNA_material_types.h"
-#  include "DNA_mesh_types.h"
 #  include "DNA_node_types.h"
-#  include "DNA_scene_types.h"
 #  include "DNA_texture_types.h"
 #  include "DNA_world_types.h"
 #endif