From 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Thu, 19 Mar 2020 09:33:03 +0100 Subject: Cleanup: `make format` after SortedIncludes change --- .../depsgraph/intern/builder/deg_builder.cc | 10 +++++----- .../depsgraph/intern/builder/deg_builder_cycle.cc | 2 +- .../depsgraph/intern/builder/deg_builder_nodes.cc | 12 ++++++------ .../intern/builder/deg_builder_nodes_rig.cc | 4 ++-- .../intern/builder/deg_builder_nodes_view_layer.cc | 4 ++-- .../intern/builder/deg_builder_pchanmap.cc | 2 +- .../intern/builder/deg_builder_relations.cc | 22 +++++++++++----------- .../intern/builder/deg_builder_relations.h | 4 ++-- .../intern/builder/deg_builder_relations_rig.cc | 6 +++--- .../builder/deg_builder_relations_view_layer.cc | 4 ++-- .../intern/builder/deg_builder_remove_noop.cc | 4 ++-- .../depsgraph/intern/builder/deg_builder_rna.cc | 4 ++-- .../intern/builder/deg_builder_transitive.cc | 2 +- 13 files changed, 40 insertions(+), 40 deletions(-) (limited to 'source/blender/depsgraph/intern/builder') diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc index 765a6e1006a..18ab9bf7e43 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder.cc @@ -25,15 +25,15 @@ #include +#include "DNA_ID.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_layer_types.h" -#include "DNA_ID.h" #include "DNA_object_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_stack.h" +#include "BLI_utildefines.h" #include "BKE_action.h" @@ -41,16 +41,16 @@ extern "C" { #include "BKE_animsys.h" } +#include "intern/builder/deg_builder_cache.h" +#include "intern/builder/deg_builder_remove_noop.h" #include "intern/depsgraph.h" #include "intern/depsgraph_relation.h" #include "intern/depsgraph_tag.h" #include "intern/depsgraph_type.h" -#include "intern/builder/deg_builder_cache.h" -#include "intern/builder/deg_builder_remove_noop.h" #include "intern/eval/deg_eval_copy_on_write.h" #include "intern/node/deg_node.h" -#include "intern/node/deg_node_id.h" #include "intern/node/deg_node_component.h" +#include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" #include "DEG_depsgraph.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc index e0d162a49c5..6deecfde9e1 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc @@ -27,8 +27,8 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_stack.h" +#include "BLI_utildefines.h" #include "intern/node/deg_node.h" #include "intern/node/deg_node_component.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index ea49882fd77..672cf29ac0e 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -47,16 +47,16 @@ extern "C" { #include "DNA_gpencil_types.h" #include "DNA_key_types.h" #include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_linestyle_types.h" -#include "DNA_material_types.h" #include "DNA_mask_types.h" +#include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_movieclip_types.h" #include "DNA_node_types.h" -#include "DNA_particle_types.h" #include "DNA_object_types.h" -#include "DNA_lightprobe_types.h" +#include "DNA_particle_types.h" #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" @@ -66,8 +66,8 @@ extern "C" { #include "DNA_world_types.h" #include "BKE_action.h" -#include "BKE_armature.h" #include "BKE_animsys.h" +#include "BKE_armature.h" #include "BKE_cachefile.h" #include "BKE_collection.h" #include "BKE_constraint.h" @@ -83,8 +83,8 @@ extern "C" { #include "BKE_layer.h" #include "BKE_mask.h" #include "BKE_material.h" -#include "BKE_mesh.h" #include "BKE_mball.h" +#include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_movieclip.h" #include "BKE_node.h" @@ -109,12 +109,12 @@ extern "C" { #include "intern/builder/deg_builder.h" #include "intern/depsgraph.h" +#include "intern/depsgraph_type.h" #include "intern/eval/deg_eval_copy_on_write.h" #include "intern/node/deg_node.h" #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" -#include "intern/depsgraph_type.h" namespace DEG { 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 07010a5cbef..5383e26bbd4 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc @@ -30,9 +30,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" #include "BLI_string.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_anim_types.h" @@ -50,11 +50,11 @@ extern "C" { #include "DEG_depsgraph_build.h" #include "intern/builder/deg_builder.h" +#include "intern/depsgraph_type.h" #include "intern/eval/deg_eval_copy_on_write.h" #include "intern/node/deg_node.h" #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_operation.h" -#include "intern/depsgraph_type.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc index d5e9c024812..1aa3c5bf613 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc @@ -30,9 +30,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" #include "BLI_string.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_freestyle_types.h" @@ -52,10 +52,10 @@ extern "C" { #include "intern/builder/deg_builder.h" #include "intern/depsgraph.h" +#include "intern/depsgraph_type.h" #include "intern/node/deg_node.h" #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_operation.h" -#include "intern/depsgraph_type.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc index 5483ff9c030..ecacfcf7ee9 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc @@ -26,8 +26,8 @@ #include #include -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 4647486bafd..5c45d3e126e 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -25,22 +25,22 @@ #include "intern/builder/deg_builder_relations.h" +#include /* required for STREQ later on. */ #include #include -#include /* required for STREQ later on. */ #include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_action_types.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" -#include "DNA_camera_types.h" #include "DNA_cachefile_types.h" +#include "DNA_camera_types.h" #include "DNA_collection_types.h" #include "DNA_constraint_types.h" #include "DNA_curve_types.h" @@ -48,16 +48,17 @@ extern "C" { #include "DNA_gpencil_types.h" #include "DNA_key_types.h" #include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_linestyle_types.h" -#include "DNA_material_types.h" #include "DNA_mask_types.h" +#include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_movieclip_types.h" #include "DNA_node_types.h" -#include "DNA_particle_types.h" -#include "DNA_lightprobe_types.h" +#include "DNA_object_force_types.h" #include "DNA_object_types.h" +#include "DNA_particle_types.h" #include "DNA_rigidbody_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" @@ -66,24 +67,23 @@ extern "C" { #include "DNA_texture_types.h" #include "DNA_volume_types.h" #include "DNA_world_types.h" -#include "DNA_object_force_types.h" #include "BKE_action.h" -#include "BKE_armature.h" #include "BKE_animsys.h" +#include "BKE_armature.h" #include "BKE_collection.h" +#include "BKE_collision.h" #include "BKE_constraint.h" #include "BKE_curve.h" #include "BKE_effect.h" -#include "BKE_collision.h" #include "BKE_fcurve.h" +#include "BKE_gpencil_modifier.h" #include "BKE_image.h" #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_material.h" #include "BKE_mball.h" #include "BKE_modifier.h" -#include "BKE_gpencil_modifier.h" #include "BKE_node.h" #include "BKE_object.h" #include "BKE_particle.h" @@ -106,8 +106,8 @@ extern "C" { #include "intern/builder/deg_builder.h" #include "intern/builder/deg_builder_pchanmap.h" #include "intern/debug/deg_debug.h" -#include "intern/depsgraph_tag.h" #include "intern/depsgraph_physics.h" +#include "intern/depsgraph_tag.h" #include "intern/eval/deg_eval_copy_on_write.h" #include "intern/node/deg_node.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h index e5e2116008b..099a00d66a6 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h @@ -33,16 +33,16 @@ #include "RNA_access.h" #include "RNA_types.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "intern/builder/deg_builder.h" #include "intern/builder/deg_builder_map.h" #include "intern/builder/deg_builder_rna.h" #include "intern/depsgraph.h" #include "intern/node/deg_node.h" -#include "intern/node/deg_node_id.h" #include "intern/node/deg_node_component.h" +#include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" struct Base; diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc index 12cd6936a13..6fe9a3c2a00 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc @@ -25,14 +25,14 @@ #include "intern/builder/deg_builder_relations.h" +#include /* required for STREQ later on. */ #include #include -#include /* required for STREQ later on. */ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_action_types.h" @@ -57,8 +57,8 @@ extern "C" { #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_operation.h" -#include "intern/depsgraph_type.h" #include "intern/depsgraph_relation.h" +#include "intern/depsgraph_type.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc index 41e91ba7286..d3bdaccd404 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc @@ -25,14 +25,14 @@ #include "intern/builder/deg_builder_relations.h" +#include /* required for STREQ later on. */ #include #include -#include /* required for STREQ later on. */ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_blenlib.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_linestyle_types.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc b/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc index aa0cb66a38f..2ce1f1f1c1d 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_remove_noop.cc @@ -28,10 +28,10 @@ #include "intern/node/deg_node.h" #include "intern/node/deg_node_operation.h" +#include "intern/debug/deg_debug.h" #include "intern/depsgraph.h" -#include "intern/depsgraph_type.h" #include "intern/depsgraph_relation.h" -#include "intern/debug/deg_debug.h" +#include "intern/depsgraph_type.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc index 6ae2e4ce696..73f6730be03 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc @@ -27,9 +27,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_action_types.h" @@ -44,8 +44,8 @@ extern "C" { #include "RNA_access.h" -#include "intern/depsgraph.h" #include "intern/builder/deg_builder.h" +#include "intern/depsgraph.h" #include "intern/node/deg_node.h" #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_id.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc index fc7c546e294..3f828ef5bb0 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc @@ -29,9 +29,9 @@ #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_operation.h" +#include "intern/debug/deg_debug.h" #include "intern/depsgraph.h" #include "intern/depsgraph_relation.h" -#include "intern/debug/deg_debug.h" namespace DEG { -- cgit v1.2.3