diff options
author | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:03 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:58 +0300 |
commit | 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch) | |
tree | ec50d7bdca3901a6afcc986943011f08f9516307 /source/blender/depsgraph/intern | |
parent | 008aaaa37841ca27d2bba80d8859336655cef455 (diff) |
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'source/blender/depsgraph/intern')
39 files changed, 97 insertions, 97 deletions
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 <cstring> +#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 <cstdio> #include <cstdlib> -#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 <stdio.h> #include <string.h> -#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 <cstring> /* required for STREQ later on. */ #include <stdio.h> #include <stdlib.h> -#include <cstring> /* required for STREQ later on. */ #include <unordered_set> #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 <cstring> /* required for STREQ later on. */ #include <stdio.h> #include <stdlib.h> -#include <cstring> /* 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 <cstring> /* required for STREQ later on. */ #include <stdio.h> #include <stdlib.h> -#include <cstring> /* 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 { diff --git a/source/blender/depsgraph/intern/debug/deg_debug.cc b/source/blender/depsgraph/intern/debug/deg_debug.cc index 74a042989db..ca27cef2c56 100644 --- a/source/blender/depsgraph/intern/debug/deg_debug.cc +++ b/source/blender/depsgraph/intern/debug/deg_debug.cc @@ -23,10 +23,10 @@ #include "intern/debug/deg_debug.h" -#include "BLI_utildefines.h" #include "BLI_console.h" #include "BLI_hash.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "PIL_time_utildefines.h" diff --git a/source/blender/depsgraph/intern/debug/deg_debug.h b/source/blender/depsgraph/intern/debug/deg_debug.h index 21a802828dc..f5e2f2c4b51 100644 --- a/source/blender/depsgraph/intern/debug/deg_debug.h +++ b/source/blender/depsgraph/intern/debug/deg_debug.h @@ -23,8 +23,8 @@ #pragma once -#include "intern/depsgraph_type.h" #include "intern/debug/deg_time_average.h" +#include "intern/depsgraph_type.h" #include "BKE_global.h" diff --git a/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc index 73b99213005..7080f8a1a9b 100644 --- a/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc +++ b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc @@ -25,8 +25,8 @@ #include <cstdarg> -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_listBase.h" diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index a19a2958f28..2ce8f1aa071 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -30,24 +30,24 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_console.h" -#include "BLI_hash.h" #include "BLI_ghash.h" +#include "BLI_hash.h" +#include "BLI_utildefines.h" extern "C" { -#include "BKE_scene.h" #include "BKE_global.h" #include "BKE_idcode.h" +#include "BKE_scene.h" } #include "DEG_depsgraph.h" #include "DEG_depsgraph_debug.h" -#include "intern/depsgraph_update.h" #include "intern/depsgraph_physics.h" -#include "intern/depsgraph_relation.h" #include "intern/depsgraph_registry.h" +#include "intern/depsgraph_relation.h" +#include "intern/depsgraph_update.h" #include "intern/eval/deg_eval_copy_on_write.h" diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc index 3fe585ff73c..d78bc07ac5e 100644 --- a/source/blender/depsgraph/intern/depsgraph_build.cc +++ b/source/blender/depsgraph/intern/depsgraph_build.cc @@ -25,9 +25,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "PIL_time.h" #include "PIL_time_utildefines.h" @@ -42,8 +42,8 @@ extern "C" { } /* extern "C" */ #include "DEG_depsgraph.h" -#include "DEG_depsgraph_debug.h" #include "DEG_depsgraph_build.h" +#include "DEG_depsgraph_debug.h" #include "builder/deg_builder.h" #include "builder/deg_builder_cache.h" @@ -59,8 +59,8 @@ extern "C" { #include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" -#include "intern/depsgraph_relation.h" #include "intern/depsgraph_registry.h" +#include "intern/depsgraph_relation.h" #include "intern/depsgraph_type.h" /* ****************** */ diff --git a/source/blender/depsgraph/intern/depsgraph_debug.cc b/source/blender/depsgraph/intern/depsgraph_debug.cc index 25f7e9117d1..c713a4a3fb1 100644 --- a/source/blender/depsgraph/intern/depsgraph_debug.cc +++ b/source/blender/depsgraph/intern/depsgraph_debug.cc @@ -23,8 +23,8 @@ * Implementation of tools for debugging the depsgraph */ -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_scene_types.h" @@ -33,14 +33,14 @@ extern "C" { #include "DNA_object_types.h" #include "DEG_depsgraph.h" -#include "DEG_depsgraph_debug.h" #include "DEG_depsgraph_build.h" +#include "DEG_depsgraph_debug.h" #include "DEG_depsgraph_query.h" +#include "intern/debug/deg_debug.h" #include "intern/depsgraph.h" #include "intern/depsgraph_relation.h" #include "intern/depsgraph_type.h" -#include "intern/debug/deg_debug.h" #include "intern/node/deg_node_component.h" #include "intern/node/deg_node_id.h" #include "intern/node/deg_node_time.h" diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc index 665a32b886c..7e7ab07825f 100644 --- a/source/blender/depsgraph/intern/depsgraph_eval.cc +++ b/source/blender/depsgraph/intern/depsgraph_eval.cc @@ -25,9 +25,9 @@ #include "MEM_guardedalloc.h" +#include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BLI_ghash.h" extern "C" { #include "BKE_scene.h" diff --git a/source/blender/depsgraph/intern/depsgraph_physics.cc b/source/blender/depsgraph/intern/depsgraph_physics.cc index cabb95fe732..d7c09780845 100644 --- a/source/blender/depsgraph/intern/depsgraph_physics.cc +++ b/source/blender/depsgraph/intern/depsgraph_physics.cc @@ -38,8 +38,8 @@ extern "C" { } /* extern "C" */ #include "DNA_collection_types.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" +#include "DNA_object_types.h" #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_physics.h" diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc index 4205f79b9c0..1f1e2482094 100644 --- a/source/blender/depsgraph/intern/depsgraph_query.cc +++ b/source/blender/depsgraph/intern/depsgraph_query.cc @@ -28,9 +28,9 @@ extern "C" { #include <string.h> // XXX: memcpy -#include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_ghash.h" +#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "BKE_action.h" // XXX: BKE_pose_channel_find_name #include "BKE_customdata.h" diff --git a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc index 793862bf2fd..6409f5b3cea 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_foreach.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_foreach.cc @@ -26,8 +26,8 @@ #include "MEM_guardedalloc.h" extern "C" { -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" } /* extern "C" */ #include "DNA_object_types.h" diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc index 90ab7565f4a..427a16adfc4 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc @@ -29,13 +29,13 @@ #include "MEM_guardedalloc.h" extern "C" { -#include "BLI_utildefines.h" -#include "BLI_math.h" #include "BKE_anim.h" #include "BKE_idprop.h" #include "BKE_layer.h" #include "BKE_node.h" #include "BKE_object.h" +#include "BLI_math.h" +#include "BLI_utildefines.h" } /* extern "C" */ #include "DNA_object_types.h" diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index a14f22350a4..2c8f89b99f9 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -25,13 +25,13 @@ #include "intern/depsgraph_tag.h" -#include <stdio.h> #include <cstring> /* required for memset */ #include <queue> +#include <stdio.h> -#include "BLI_utildefines.h" #include "BLI_math_bits.h" #include "BLI_task.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_anim_types.h" @@ -62,8 +62,8 @@ extern "C" { #include "intern/builder/deg_builder.h" #include "intern/depsgraph.h" -#include "intern/depsgraph_update.h" #include "intern/depsgraph_registry.h" +#include "intern/depsgraph_update.h" #include "intern/eval/deg_eval_copy_on_write.h" #include "intern/eval/deg_eval_flush.h" #include "intern/node/deg_node.h" diff --git a/source/blender/depsgraph/intern/depsgraph_type.cc b/source/blender/depsgraph/intern/depsgraph_type.cc index ef1fda1df44..559bf8dfdab 100644 --- a/source/blender/depsgraph/intern/depsgraph_type.cc +++ b/source/blender/depsgraph/intern/depsgraph_type.cc @@ -25,8 +25,8 @@ #include <cstdlib> // for BLI_assert() -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "DNA_customdata_types.h" diff --git a/source/blender/depsgraph/intern/depsgraph_type.h b/source/blender/depsgraph/intern/depsgraph_type.h index 201d8b9a59e..fbf5c2fd381 100644 --- a/source/blender/depsgraph/intern/depsgraph_type.h +++ b/source/blender/depsgraph/intern/depsgraph_type.h @@ -33,13 +33,13 @@ /* TODO(sergey): Ideally we'll just use char* and statically allocated strings * to avoid any possible overhead caused by string (re)allocation/formatting. */ -#include <string> -#include <deque> -#include <vector> #include <algorithm> +#include <deque> #include <map> #include <set> +#include <string> #include <unordered_map> +#include <vector> struct Depsgraph; diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc index 1296c87bbb0..4540cda7e99 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval.cc @@ -28,22 +28,24 @@ #include "PIL_time.h" #include "BLI_compiler_attrs.h" -#include "BLI_utildefines.h" -#include "BLI_task.h" #include "BLI_ghash.h" #include "BLI_gsqueue.h" +#include "BLI_task.h" +#include "BLI_utildefines.h" #include "BKE_global.h" +#include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_node_types.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" #include "atomic_ops.h" +#include "intern/depsgraph.h" +#include "intern/depsgraph_relation.h" #include "intern/eval/deg_eval_copy_on_write.h" #include "intern/eval/deg_eval_flush.h" #include "intern/eval/deg_eval_stats.h" @@ -52,8 +54,6 @@ #include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" #include "intern/node/deg_node_time.h" -#include "intern/depsgraph.h" -#include "intern/depsgraph_relation.h" namespace DEG { 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 d8ce590c611..f51def4caa9 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 @@ -35,15 +35,15 @@ #include <cstring> -#include "BLI_utildefines.h" #include "BLI_listbase.h" -#include "BLI_threads.h" #include "BLI_string.h" +#include "BLI_threads.h" +#include "BLI_utildefines.h" #include "BKE_curve.h" #include "BKE_global.h" -#include "BKE_idprop.h" #include "BKE_gpencil.h" +#include "BKE_idprop.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_scene.h" @@ -59,20 +59,20 @@ extern "C" { #include "DNA_armature_types.h" #include "DNA_mesh_types.h" #include "DNA_modifier_types.h" -#include "DNA_scene_types.h" -#include "DNA_sequence_types.h" -#include "DNA_sound_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" +#include "DNA_sound_types.h" #include "DRW_engine.h" #ifdef NESTED_ID_NASTY_WORKAROUND # include "DNA_curve_types.h" # include "DNA_key_types.h" -# include "DNA_light_types.h" # include "DNA_lattice_types.h" +# include "DNA_light_types.h" # include "DNA_linestyle_types.h" # include "DNA_material_types.h" # include "DNA_meta_types.h" @@ -93,9 +93,9 @@ extern "C" { #include "BKE_sound.h" } -#include "intern/depsgraph.h" #include "intern/builder/deg_builder.h" #include "intern/builder/deg_builder_nodes.h" +#include "intern/depsgraph.h" #include "intern/eval/deg_eval_runtime_backup.h" #include "intern/node/deg_node.h" #include "intern/node/deg_node_id.h" diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc index 2b4fd50ccc4..dd72bc22a70 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc @@ -27,11 +27,11 @@ #include <cmath> -#include "BLI_utildefines.h" +#include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_math_vector.h" #include "BLI_task.h" -#include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BKE_object.h" #include "BKE_scene.h" diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc index a1d6961cf5d..9f47402790c 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc @@ -23,8 +23,8 @@ #include "intern/eval/deg_eval_runtime_backup_scene.h" -#include "DNA_scene_types.h" #include "DNA_rigidbody_types.h" +#include "DNA_scene_types.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h index 57b533a1b84..05f37b45dc4 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h @@ -23,8 +23,8 @@ #pragma once -#include "intern/eval/deg_eval_runtime_backup_sequence.h" #include "intern/depsgraph_type.h" +#include "intern/eval/deg_eval_runtime_backup_sequence.h" struct Scene; diff --git a/source/blender/depsgraph/intern/eval/deg_eval_stats.cc b/source/blender/depsgraph/intern/eval/deg_eval_stats.cc index 25c32e88021..f164560ac24 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_stats.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_stats.cc @@ -23,8 +23,8 @@ #include "intern/eval/deg_eval_stats.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "intern/depsgraph.h" diff --git a/source/blender/depsgraph/intern/node/deg_node_component.cc b/source/blender/depsgraph/intern/node/deg_node_component.cc index 73f9668eb5d..54796b8965b 100644 --- a/source/blender/depsgraph/intern/node/deg_node_component.cc +++ b/source/blender/depsgraph/intern/node/deg_node_component.cc @@ -23,11 +23,11 @@ #include "intern/node/deg_node_component.h" -#include <stdio.h> #include <cstring> /* required for STREQ later on. */ +#include <stdio.h> -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_object_types.h" @@ -35,8 +35,8 @@ extern "C" { #include "BKE_action.h" } /* extern "C" */ -#include "intern/node/deg_node_id.h" #include "intern/node/deg_node_factory.h" +#include "intern/node/deg_node_id.h" #include "intern/node/deg_node_operation.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/node/deg_node_component.h b/source/blender/depsgraph/intern/node/deg_node_component.h index 6a2157fa3b2..38ea4005a72 100644 --- a/source/blender/depsgraph/intern/node/deg_node_component.h +++ b/source/blender/depsgraph/intern/node/deg_node_component.h @@ -26,8 +26,8 @@ #include "intern/node/deg_node.h" #include "intern/node/deg_node_operation.h" -#include "BLI_utildefines.h" #include "BLI_string.h" +#include "BLI_utildefines.h" struct GHash; struct ID; diff --git a/source/blender/depsgraph/intern/node/deg_node_factory.h b/source/blender/depsgraph/intern/node/deg_node_factory.h index 38487e7f979..db2c3bb2f44 100644 --- a/source/blender/depsgraph/intern/node/deg_node_factory.h +++ b/source/blender/depsgraph/intern/node/deg_node_factory.h @@ -25,8 +25,8 @@ #include "MEM_guardedalloc.h" -#include "intern/node/deg_node.h" #include "intern/depsgraph_type.h" +#include "intern/node/deg_node.h" struct ID; diff --git a/source/blender/depsgraph/intern/node/deg_node_id.cc b/source/blender/depsgraph/intern/node/deg_node_id.cc index cd25cc14069..0bb09390b4f 100644 --- a/source/blender/depsgraph/intern/node/deg_node_id.cc +++ b/source/blender/depsgraph/intern/node/deg_node_id.cc @@ -23,12 +23,12 @@ #include "intern/node/deg_node_id.h" -#include <stdio.h> #include <cstring> /* required for STREQ later on. */ +#include <stdio.h> -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_string.h" +#include "BLI_utildefines.h" extern "C" { #include "DNA_ID.h" @@ -41,8 +41,8 @@ extern "C" { #include "DEG_depsgraph.h" #include "intern/eval/deg_eval_copy_on_write.h" -#include "intern/node/deg_node_factory.h" #include "intern/node/deg_node_component.h" +#include "intern/node/deg_node_factory.h" #include "intern/node/deg_node_time.h" namespace DEG { diff --git a/source/blender/depsgraph/intern/node/deg_node_id.h b/source/blender/depsgraph/intern/node/deg_node_id.h index 6eea31ebff9..80bb67f182f 100644 --- a/source/blender/depsgraph/intern/node/deg_node_id.h +++ b/source/blender/depsgraph/intern/node/deg_node_id.h @@ -23,9 +23,9 @@ #pragma once -#include "intern/node/deg_node.h" #include "BLI_sys_types.h" #include "DNA_ID.h" +#include "intern/node/deg_node.h" struct GHash; diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc b/source/blender/depsgraph/intern/node/deg_node_operation.cc index 820dd607e3f..78399d5c953 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.cc +++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc @@ -25,12 +25,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "intern/depsgraph.h" -#include "intern/node/deg_node_factory.h" #include "intern/node/deg_node_component.h" +#include "intern/node/deg_node_factory.h" #include "intern/node/deg_node_id.h" namespace DEG { |