Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dalai@blender.org>2020-03-19 11:33:03 +0300
committerDalai Felinto <dalai@blender.org>2020-03-19 11:33:58 +0300
commit2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch)
treeec50d7bdca3901a6afcc986943011f08f9516307 /source/blender/depsgraph/intern/eval
parent008aaaa37841ca27d2bba80d8859336655cef455 (diff)
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'source/blender/depsgraph/intern/eval')
-rw-r--r--source/blender/depsgraph/intern/eval/deg_eval.cc10
-rw-r--r--source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc16
-rw-r--r--source/blender/depsgraph/intern/eval/deg_eval_flush.cc4
-rw-r--r--source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc2
-rw-r--r--source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h2
-rw-r--r--source/blender/depsgraph/intern/eval/deg_eval_stats.cc2
6 files changed, 18 insertions, 18 deletions
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"