[Bf-blender-cvs] [cc193f1] depsgraph_refactor: Depsgraph: headers cleanup
Sergey Sharybin
noreply at git.blender.org
Thu Jan 29 16:49:42 CET 2015
Commit: cc193f1cdb0890cd659a74bba79f92df2cc91f8a
Author: Sergey Sharybin
Date: Thu Jan 29 20:48:51 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rBcc193f1cdb0890cd659a74bba79f92df2cc91f8a
Depsgraph: headers cleanup
Mainly avoid headers include from headers.
===================================================================
M source/blender/depsgraph/DEG_depsgraph_debug.h
M source/blender/depsgraph/intern/depsgraph.cpp
M source/blender/depsgraph/intern/depsgraph.h
M source/blender/depsgraph/intern/depsgraph_build.h
M source/blender/depsgraph/intern/depsgraph_build_relations.cpp
M source/blender/depsgraph/intern/depsgraph_debug.cpp
M source/blender/depsgraph/intern/depsgraph_debug.h
M source/blender/depsgraph/intern/depsgraph_eval.cpp
M source/blender/depsgraph/intern/depsgraph_eval.h
M source/blender/depsgraph/intern/depsgraph_intern.h
M source/blender/depsgraph/intern/depsgraph_query.cpp
M source/blender/depsgraph/intern/depsgraph_queue.cpp
M source/blender/depsgraph/intern/depsgraph_tag.cpp
M source/blender/depsgraph/intern/depsgraph_type_defines.cpp
M source/blender/depsgraph/intern/depsgraph_types.h
M source/blender/depsgraph/intern/depsnode.cpp
M source/blender/depsgraph/intern/depsnode.h
M source/blender/depsgraph/intern/depsnode_component.cpp
M source/blender/depsgraph/intern/depsnode_component.h
M source/blender/depsgraph/intern/depsnode_operation.cpp
M source/blender/depsgraph/intern/depsnode_operation.h
===================================================================
diff --git a/source/blender/depsgraph/DEG_depsgraph_debug.h b/source/blender/depsgraph/DEG_depsgraph_debug.h
index 607dbce..2cb2679 100644
--- a/source/blender/depsgraph/DEG_depsgraph_debug.h
+++ b/source/blender/depsgraph/DEG_depsgraph_debug.h
@@ -33,10 +33,6 @@
extern "C" {
#endif
-#include <stdio.h>
-
-#include "DNA_listBase.h"
-
struct DepsgraphSettings;
struct GHash;
struct ID;
diff --git a/source/blender/depsgraph/intern/depsgraph.cpp b/source/blender/depsgraph/intern/depsgraph.cpp
index f6af060..41f0dfb 100644
--- a/source/blender/depsgraph/intern/depsgraph.cpp
+++ b/source/blender/depsgraph/intern/depsgraph.cpp
@@ -39,8 +39,11 @@ extern "C" {
#include "DNA_key_types.h"
#include "DNA_object_types.h"
#include "DNA_sequence_types.h"
+
+#include "RNA_access.h"
}
+#include "DEG_depsgraph.h"
#include "depsgraph.h" /* own include */
#include "depsnode.h"
#include "depsnode_operation.h"
diff --git a/source/blender/depsgraph/intern/depsgraph.h b/source/blender/depsgraph/intern/depsgraph.h
index 0bf9893..13f3764 100644
--- a/source/blender/depsgraph/intern/depsgraph.h
+++ b/source/blender/depsgraph/intern/depsgraph.h
@@ -33,7 +33,6 @@
#ifndef __DEPSGRAPH_H__
#define __DEPSGRAPH_H__
-#include "MEM_guardedalloc.h"
#include "BLI_threads.h" /* for SpinLock */
#include "depsgraph_types.h"
diff --git a/source/blender/depsgraph/intern/depsgraph_build.h b/source/blender/depsgraph/intern/depsgraph_build.h
index 47aa525..824a782 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.h
+++ b/source/blender/depsgraph/intern/depsgraph_build.h
@@ -27,8 +27,6 @@
#ifndef __DEPSGRAPH_BUILD_H__
#define __DEPSGRAPH_BUILD_H__
-#include "depsgraph_types.h"
-
#include "depsgraph_util_id.h"
struct ListBase;
diff --git a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
index a079062..bc4c0cc 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
@@ -100,8 +100,6 @@ extern "C" {
#include "depsgraph_util_pchanmap.h"
-#include "stubs.h" // XXX: REMOVE THIS INCLUDE ONCE DEPSGRAPH REFACTOR PROJECT IS DONE!!!
-
namespace {
/* TODO(sergey): This is a stupid copy of function from depsgraph.c/ */
diff --git a/source/blender/depsgraph/intern/depsgraph_debug.cpp b/source/blender/depsgraph/intern/depsgraph_debug.cpp
index f9b1eb5d..248461b 100644
--- a/source/blender/depsgraph/intern/depsgraph_debug.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_debug.cpp
@@ -33,10 +33,12 @@ extern "C" {
#include "BLI_utildefines.h"
#include "BLI_listbase.h"
#include "BLI_ghash.h"
+#include "BLI_string.h"
#include "DNA_scene_types.h"
#include "DNA_userdef_types.h"
+#include "DEG_depsgraph.h"
#include "DEG_depsgraph_debug.h"
#include "DEG_depsgraph_build.h"
@@ -48,7 +50,6 @@ extern "C" {
#include "depsnode.h"
#include "depsnode_component.h"
#include "depsnode_operation.h"
-#include "depsgraph_types.h"
#include "depsgraph_intern.h"
/* ****************** */
diff --git a/source/blender/depsgraph/intern/depsgraph_debug.h b/source/blender/depsgraph/intern/depsgraph_debug.h
index 8b54209..b497026 100644
--- a/source/blender/depsgraph/intern/depsgraph_debug.h
+++ b/source/blender/depsgraph/intern/depsgraph_debug.h
@@ -27,8 +27,6 @@
#ifndef __DEPSGRAPH_DEBUG_H__
#define __DEPSGRAPH_DEBUG_H__
-#include <stdarg.h>
-
#include "depsgraph_types.h"
extern "C" {
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cpp b/source/blender/depsgraph/intern/depsgraph_eval.cpp
index 98bc69c..59b77f3 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cpp
@@ -31,26 +31,21 @@
#include "PIL_time.h"
extern "C" {
-#include "BLI_task.h"
#include "BLI_utildefines.h"
-
-#include "DNA_ID.h"
+#include "BLI_task.h"
#include "BKE_depsgraph.h"
-#include "BKE_global.h" /* XXX only for debug value, remove eventually */
-#include "BKE_main.h"
+#include "DEG_depsgraph.h"
} /* extern "C" */
#include "atomic_ops.h"
+#include "depsgraph_eval.h"
#include "depsgraph.h"
#include "depsnode.h"
#include "depsnode_component.h"
#include "depsnode_operation.h"
-#include "depsgraph_types.h"
-#include "depsgraph_eval.h"
-#include "depsgraph_intern.h"
#include "depsgraph_debug.h"
#ifdef WITH_LEGACY_DEPSGRAPH
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.h b/source/blender/depsgraph/intern/depsgraph_eval.h
index ce4339e..f3a7c68 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.h
+++ b/source/blender/depsgraph/intern/depsgraph_eval.h
@@ -33,8 +33,6 @@
#ifndef __DEPSGRAPH_EVAL_TYPES_H__
#define __DEPSGRAPH_EVAL_TYPES_H__
-#include "DEG_depsgraph.h"
-
struct Depsgraph;
struct OperationDepsNode;
diff --git a/source/blender/depsgraph/intern/depsgraph_intern.h b/source/blender/depsgraph/intern/depsgraph_intern.h
index 1015e4d..181b21d 100644
--- a/source/blender/depsgraph/intern/depsgraph_intern.h
+++ b/source/blender/depsgraph/intern/depsgraph_intern.h
@@ -30,16 +30,10 @@
#ifndef __DEPSGRAPH_INTERN_H__
#define __DEPSGRAPH_INTERN_H__
-#include <stdlib.h>
-
-extern "C" {
-#include "BLI_string.h"
-#include "BLI_utildefines.h"
-} /* extern "C" */
+#include "MEM_guardedalloc.h"
#include "depsgraph.h"
#include "depsnode.h"
-#include "depsgraph_types.h"
struct Main;
struct Group;
diff --git a/source/blender/depsgraph/intern/depsgraph_query.cpp b/source/blender/depsgraph/intern/depsgraph_query.cpp
index 41dbcc1..faddd11 100644
--- a/source/blender/depsgraph/intern/depsgraph_query.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_query.cpp
@@ -26,40 +26,21 @@
* Implementation of Querying and Filtering API's
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
#include "MEM_guardedalloc.h"
extern "C" {
-#include "BLI_blenlib.h"
-#include "BLI_ghash.h"
#include "BLI_utildefines.h"
-
-#include "DNA_action_types.h"
-#include "DNA_ID.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_sequence_types.h"
+#include "BLI_ghash.h"
#include "BKE_main.h"
-#include "DEG_depsgraph.h"
#include "DEG_depsgraph_query.h"
-
-#include "RNA_access.h"
-#include "RNA_types.h"
} /* extern "C" */
+#include "depsgraph_queue.h"
#include "depsnode.h"
-#include "depsnode_component.h"
#include "depsnode_operation.h"
-#include "depsgraph_types.h"
#include "depsgraph_intern.h"
-#include "depsgraph_queue.h"
-
-#include "stubs.h" // XXX: THIS MUST BE REMOVED WHEN THE DEPSGRAPH REFACTOR IS DONE
/* ************************************************ */
/* Low-Level Graph Traversal */
diff --git a/source/blender/depsgraph/intern/depsgraph_queue.cpp b/source/blender/depsgraph/intern/depsgraph_queue.cpp
index 44709f3..40b4787 100644
--- a/source/blender/depsgraph/intern/depsgraph_queue.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_queue.cpp
@@ -26,16 +26,14 @@
* Implementation of special queue type for use in Depsgraph traversals
*/
-#include <stdio.h>
#include <stdlib.h>
#include "MEM_guardedalloc.h"
extern "C" {
-#include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
#include "BLI_heap.h"
#include "BLI_ghash.h"
-#include "BLI_utildefines.h"
} /* extern "C" */
#include "depsgraph_queue.h"
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cpp b/source/blender/depsgraph/intern/depsgraph_tag.cpp
index 131bd5b..c7b0533 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cpp
@@ -32,33 +32,25 @@
extern "C" {
#include "BLI_utildefines.h"
-#include "DNA_ID.h"
#include "DNA_object_types.h"
#include "DNA_particle_types.h"
-#include "DNA_scene_types.h"
#include "DNA_screen_types.h"
#include "DNA_windowmanager_types.h"
-#include "BKE_global.h"
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_node.h"
-#include "RNA_access.h"
-#include "RNA_types.h"
+#include "DEG_depsgraph.h"
/* TODO(sergey): because of bloody "new" in the BKE_screen.h. */
unsigned int BKE_screen_visible_layers(bScreen *screen, Scene *scene);
} /* extern "C" */
-#include "DEG_depsgraph.h"
-
-#include "depsgraph.h"
#include "depsgraph_debug.h"
#include "depsnode.h"
#include "depsnode_component.h"
#include "depsnode_operation.h"
-#include "depsgraph_types.h"
#include "depsgraph_intern.h"
/* ************************************************** */
diff --git a/source/blender/depsgraph/intern/depsgraph_type_defines.cpp b/source/blender/depsgraph/intern/depsgraph_type_defines.cpp
index c56fdce..296c694 100644
--- a/source/blender/depsgraph/intern/depsgraph_type_defines.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_type_defines.cpp
@@ -25,10 +25,6 @@
*
* Defines and code for core node types
*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
extern "C" {
#include "BLI_utildefines.h"
@@ -39,23 +35,22 @@ extern "C" {
#include "BKE_animsys.h"
#include "BKE_fcurve.h"
+#include "RNA_access.h"
+
#include "DEG_depsgraph.h"
} /* extern "C" */
#include "depsgraph_debug.h"
-#include "depsgraph_types.h"
#include "depsgraph_intern.h"
#include "depsnode.h"
#include "depsnode_component.h"
#include "depsnode_operation.h"
-#include "depsgraph_util_map.h"
-
#include "stubs.h" // XXX: THIS MUST BE REMOVED WHEN THE DEPSGRAPH REFACTOR IS DONE
void BKE_animsys_eval_animdata(EvaluationContext *UNUSED(eval_ctx),
- ID *id,
- TimeSourceDepsNode *time_src)
+ ID *id,
+ TimeSourceDepsNode *time_src)
{
DEG_DEBUG_PRINTF("%s on %s\n", __func__, id->name);
AnimData *adt = BKE_animdata_from_id(id);
diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h
index bbcb3e3..c5cb952 100644
--- a/source/blender/depsgraph/intern/depsgraph_types.h
+++ b/source/blender/depsgraph/intern/depsgraph_types.h
@@ -94,9 +94,9 @@ typedef enum eDepsNode_Type {
/* Identifiers for common operations (as an enum) */
typedef enum eDepsOperation_Code {
- #define DEF_DEG_OPCODE(label) DEG_OPCODE_##label,
- #
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list