[Bf-blender-cvs] [aeaa20e] depsgraph_cleanup: Depsgraph: Use more explicit path to include headers
Sergey Sharybin
noreply at git.blender.org
Thu May 26 13:55:03 CEST 2016
Commit: aeaa20e52c082cba630cfe26d746d7a265e39a32
Author: Sergey Sharybin
Date: Thu May 26 12:14:45 2016 +0200
Branches: depsgraph_cleanup
https://developer.blender.org/rBaeaa20e52c082cba630cfe26d746d7a265e39a32
Depsgraph: Use more explicit path to include headers
Makes it easier to see where exactly file is coming from, additionally
should help compiler to find headers quicker.
===================================================================
M source/blender/depsgraph/CMakeLists.txt
M source/blender/depsgraph/intern/builder/deg_builder.cc
M source/blender/depsgraph/intern/builder/deg_builder.h
M source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes.h
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.h
M source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
M source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
M source/blender/depsgraph/intern/depsgraph.cc
M source/blender/depsgraph/intern/depsgraph.h
M source/blender/depsgraph/intern/depsgraph_build.cc
M source/blender/depsgraph/intern/depsgraph_debug.cc
M source/blender/depsgraph/intern/depsgraph_eval.cc
M source/blender/depsgraph/intern/depsgraph_intern.h
M source/blender/depsgraph/intern/depsgraph_query.cc
M source/blender/depsgraph/intern/depsgraph_tag.cc
M source/blender/depsgraph/intern/depsgraph_type_defines.cc
M source/blender/depsgraph/intern/depsgraph_types.h
M source/blender/depsgraph/intern/eval/deg_eval.cc
M source/blender/depsgraph/intern/eval/deg_eval_debug.cc
M source/blender/depsgraph/intern/eval/deg_eval_debug.h
M source/blender/depsgraph/intern/eval/deg_eval_flush.cc
M source/blender/depsgraph/intern/nodes/deg_node.cc
M source/blender/depsgraph/intern/nodes/deg_node.h
M source/blender/depsgraph/intern/nodes/deg_node_component.cc
M source/blender/depsgraph/intern/nodes/deg_node_component.h
M source/blender/depsgraph/intern/nodes/deg_node_operation.cc
M source/blender/depsgraph/intern/nodes/deg_node_operation.h
===================================================================
diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index 5844a48..c248bd3 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -25,8 +25,6 @@
set(INC
.
- intern
- util
../blenkernel
../blenlib
../bmesh
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc
index 9241639..1b38a5f 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder.cc
@@ -28,22 +28,20 @@
* \ingroup depsgraph
*/
+#include "intern/builder/deg_builder.h"
+
// TODO(sergey): Use own wrapper over STD.
#include <stack>
-#include "builder/deg_builder.h"
-
#include "DNA_anim_types.h"
-#include "BLI_string.h"
-
#include "intern/depsgraph.h"
#include "intern/depsgraph_types.h"
#include "intern/nodes/deg_node.h"
#include "intern/nodes/deg_node_component.h"
#include "intern/nodes/deg_node_operation.h"
-#include "depsgraph_util_foreach.h"
+#include "util/depsgraph_util_foreach.h"
namespace DEG {
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.h b/source/blender/depsgraph/intern/builder/deg_builder.h
index 2fb3c57..7ecb4b2 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder.h
@@ -30,7 +30,7 @@
#pragma once
-#include "depsgraph_types.h"
+#include "intern/depsgraph_types.h"
struct FCurve;
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
index 00d64f7..ca5fa17 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
@@ -36,20 +36,15 @@
extern "C" {
#include "BLI_utildefines.h"
-
-#include "DNA_ID.h"
-
-#include "RNA_access.h"
-#include "RNA_types.h"
}
-#include "depsgraph_util_foreach.h"
+#include "util/depsgraph_util_foreach.h"
#include "intern/nodes/deg_node.h"
#include "intern/nodes/deg_node_component.h"
#include "intern/nodes/deg_node_operation.h"
-#include "depsgraph.h"
+#include "intern/depsgraph.h"
namespace DEG {
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 202a972..09a1f82 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -30,7 +30,7 @@
* Methods for constructing depsgraph's nodes
*/
-#include "builder/deg_builder_nodes.h"
+#include "intern/builder/deg_builder_nodes.h"
#include <stdio.h>
#include <stdlib.h>
@@ -103,8 +103,8 @@ extern "C" {
#include "intern/nodes/deg_node.h"
#include "intern/nodes/deg_node_component.h"
#include "intern/nodes/deg_node_operation.h"
-#include "depsgraph_types.h"
-#include "depsgraph_intern.h"
+#include "intern/depsgraph_types.h"
+#include "intern/depsgraph_intern.h"
namespace DEG {
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
index cce0437..747c409 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
@@ -30,7 +30,7 @@
#pragma once
-#include "depsgraph_types.h"
+#include "intern/depsgraph_types.h"
struct Base;
struct bGPdata;
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 9330f76..5c94217 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -30,7 +30,7 @@
* Methods for constructing depsgraph
*/
-#include "builder/deg_builder_relations.h"
+#include "intern/builder/deg_builder_relations.h"
#include <stdio.h>
#include <stdlib.h>
@@ -101,11 +101,11 @@ extern "C" {
#include "intern/nodes/deg_node_component.h"
#include "intern/nodes/deg_node_operation.h"
-#include "depsgraph_intern.h"
-#include "depsgraph_types.h"
+#include "intern/depsgraph_intern.h"
+#include "intern/depsgraph_types.h"
-#include "depsgraph_util_foreach.h"
-#include "depsgraph_util_pchanmap.h"
+#include "util/depsgraph_util_foreach.h"
+#include "util/depsgraph_util_pchanmap.h"
namespace DEG {
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index 3209f7b..5b34f48 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -32,7 +32,7 @@
#include <cstdio>
-#include "depsgraph_types.h"
+#include "intern/depsgraph_types.h"
#include "DNA_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 a87a999..753d1f1 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
@@ -32,22 +32,15 @@
extern "C" {
#include "MEM_guardedalloc.h"
-
-#include "BLI_utildefines.h"
-
-#include "DNA_ID.h"
-
-#include "RNA_access.h"
-#include "RNA_types.h"
}
-#include "depsgraph_util_foreach.h"
-
#include "intern/nodes/deg_node.h"
#include "intern/nodes/deg_node_component.h"
#include "intern/nodes/deg_node_operation.h"
-#include "depsgraph.h"
+#include "intern/depsgraph.h"
+
+#include "util/depsgraph_util_foreach.h"
namespace DEG {
diff --git a/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc b/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
index d389b8f..bb9493b 100644
--- a/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
+++ b/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
@@ -31,14 +31,14 @@
*/
extern "C" {
-#include "DNA_scene_types.h"
+#include "DNA_listBase.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_debug.h"
} /* extern "C" */
-#include "depsgraph_intern.h"
-#include "depsgraph_util_foreach.h"
+#include "intern/depsgraph_intern.h"
+#include "util/depsgraph_util_foreach.h"
/* ****************** */
/* Graphviz Debugging */
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc
index 3fbf551..7be2d4e 100644
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@ -30,6 +30,8 @@
* Core routines for how the Depsgraph works.
*/
+#include "intern/depsgraph.h" /* own include */
+
#include <string.h>
#include "MEM_guardedalloc.h"
@@ -50,14 +52,13 @@ extern "C" {
}
#include "DEG_depsgraph.h"
-#include "depsgraph.h" /* own include */
#include "intern/nodes/deg_node.h"
#include "intern/nodes/deg_node_component.h"
#include "intern/nodes/deg_node_operation.h"
-#include "depsgraph_intern.h"
-#include "depsgraph_util_foreach.h"
+#include "intern/depsgraph_intern.h"
+#include "util/depsgraph_util_foreach.h"
namespace DEG {
diff --git a/source/blender/depsgraph/intern/depsgraph.h b/source/blender/depsgraph/intern/depsgraph.h
index 094867c..dfcd175 100644
--- a/source/blender/depsgraph/intern/depsgraph.h
+++ b/source/blender/depsgraph/intern/depsgraph.h
@@ -38,11 +38,12 @@
#include "BLI_threads.h" /* for SpinLock */
-#include "depsgraph_types.h"
+#include "intern/depsgraph_types.h"
-#include "depsgraph_util_map.h"
-#include "depsgraph_util_set.h"
+#include "util/depsgraph_util_map.h"
+#include "util/depsgraph_util_set.h"
+struct ID;
struct PointerRNA;
struct PropertyRNA;
diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc
index 939829f..e19b203 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build.cc
@@ -54,10 +54,10 @@ extern "C" {
#include "intern/nodes/deg_node_component.h"
#include "intern/nodes/deg_node_operation.h"
-#include "depsgraph_types.h"
-#include "depsgraph_intern.h"
+#include "intern/depsgraph_types.h"
+#include "intern/depsgraph_intern.h"
-#include "depsgraph_util_foreach.h"
+#include "util/depsgraph_util_foreach.h"
/* ****************** */
/* External Build API */
diff --git a/source/blender/depsgraph/intern/depsgraph_debug.cc b/source/blender/depsgraph/intern/depsgraph_debug.cc
index de78b4e..9961ea4 100644
--- a/source/blender/depsgraph/intern/depsgraph_debug.cc
+++ b/source/blender/depsgraph/intern/depsgraph_debug.cc
@@ -38,9 +38,9 @@ extern "C" {
#include "DEG_depsgraph_build.h"
} /* extern "C" */
-#include "eval/deg_eval_debug.h"
-#include "depsgraph_intern.h"
-#include "depsgraph_util_foreach.h"
+#include "intern/eval/deg_eval_debug.h"
+#include "intern/depsgraph_intern.h"
+#include "util/depsgraph_util_foreach.h"
/* ************************************************ */
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc
index 279ffd2..588b4a4 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cc
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cc
@@ -41,13 +41,13 @@ extern "C" {
#include "DEG_depsgraph.h"
} /* extern "C" */
-#include "eval/deg_eval.h"
-#include "eval/deg_eval_flush.h"
+#include "intern/eval/deg_eval.h"
+#include "intern/eval/deg_eval_flush.h"
#include "intern/nodes/deg_node.h"
#include "intern/nodes/deg_node_operation.h"
-#include "depsgraph.h"
+#include "intern/depsgraph.h"
#ifdef WITH_LEGACY_DEPSGRAPH
static bool use_legacy_depsgraph = true;
diff --git a/source/blender/depsgraph/intern/depsgraph_intern.h b/source/blender/depsgraph/intern/depsgraph_intern.h
index c2afd15..e5d3d1f 100644
--- a/source/blender/depsgraph/intern/depsgraph_intern.h
+++ b/source/blender/depsgraph/intern/depsgraph_intern.h
@@ -44,7 +44,7 @@ extern "C" {
#include "intern/nodes/deg_node.h"
#include "intern/nodes/deg_node_component.h"
#include "intern/nodes/deg_node_operation.h"
-#include "depsgraph.h"
+#include "intern
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list