[Bf-blender-cvs] [fad8672] depsgraph_cleanup: Depsgraph: Move nodes declaration and definition to own directory

Sergey Sharybin noreply at git.blender.org
Thu May 26 10:02:45 CEST 2016


Commit: fad8672ffd7e9112d7a3f6db9bf745e8fa8521f3
Author: Sergey Sharybin
Date:   Wed May 25 22:02:31 2016 +0200
Branches: depsgraph_cleanup
https://developer.blender.org/rBfad8672ffd7e9112d7a3f6db9bf745e8fa8521f3

Depsgraph: Move nodes declaration and definition to own directory

The idea is to also split some files and make it more granular in
order to increase readability and maintainability.

===================================================================

M	source/blender/depsgraph/CMakeLists.txt
M	source/blender/depsgraph/intern/builder/deg_builder.cc
M	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
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/depsgraph.cc
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_tag.cc
M	source/blender/depsgraph/intern/depsgraph_type_defines.cc
D	source/blender/depsgraph/intern/depsnode.cc
D	source/blender/depsgraph/intern/depsnode.h
D	source/blender/depsgraph/intern/depsnode_component.cc
D	source/blender/depsgraph/intern/depsnode_component.h
D	source/blender/depsgraph/intern/depsnode_operation.cc
D	source/blender/depsgraph/intern/depsnode_operation.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_flush.cc
A	source/blender/depsgraph/intern/nodes/deg_node.cc
A	source/blender/depsgraph/intern/nodes/deg_node.h
A	source/blender/depsgraph/intern/nodes/deg_node_component.cc
A	source/blender/depsgraph/intern/nodes/deg_node_component.h
A	source/blender/depsgraph/intern/nodes/deg_node_operation.cc
A	source/blender/depsgraph/intern/nodes/deg_node_operation.h
M	source/blender/depsgraph/util/depsgraph_util_cycle.cc
M	source/blender/depsgraph/util/depsgraph_util_transitive.cc

===================================================================

diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index 8e00460..b698437 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -48,10 +48,10 @@ set(SRC
 	intern/eval/deg_eval.cc
 	intern/eval/deg_eval_debug.cc
 	intern/eval/deg_eval_flush.cc
+	intern/nodes/deg_node.cc
+	intern/nodes/deg_node_component.cc
+	intern/nodes/deg_node_operation.cc
 	intern/depsgraph.cc
-	intern/depsnode.cc
-	intern/depsnode_component.cc
-	intern/depsnode_operation.cc
 	intern/depsgraph_build.cc
 	intern/depsgraph_debug.cc
 	intern/depsgraph_eval.cc
@@ -73,10 +73,10 @@ set(SRC
 	intern/eval/deg_eval.h
 	intern/eval/deg_eval_debug.h
 	intern/eval/deg_eval_flush.h
+	intern/nodes/deg_node.h
+	intern/nodes/deg_node_component.h
+	intern/nodes/deg_node_operation.h
 	intern/depsgraph.h
-	intern/depsnode.h
-	intern/depsnode_component.h
-	intern/depsnode_operation.h
 	intern/depsgraph_debug.h
 	intern/depsgraph_intern.h
 	intern/depsgraph_types.h
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc
index e24e3a5..9241639 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder.cc
@@ -39,9 +39,9 @@
 
 #include "intern/depsgraph.h"
 #include "intern/depsgraph_types.h"
-#include "intern/depsnode.h"
-#include "intern/depsnode_component.h"
-#include "intern/depsnode_operation.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"
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index f8faecf..62ba57d 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -99,10 +99,10 @@ extern "C" {
 #include "RNA_types.h"
 } /* extern "C" */
 
-#include "builder/deg_builder.h"
-#include "depsnode.h"
-#include "depsnode_component.h"
-#include "depsnode_operation.h"
+#include "intern/builder/deg_builder.h"
+#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"
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index aa00670..f33c4cd 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -95,11 +95,12 @@ extern "C" {
 #include "RNA_types.h"
 } /* extern "C" */
 
-#include "builder/deg_builder.h"
+#include "intern/builder/deg_builder.h"
+
+#include "intern/nodes/deg_node.h"
+#include "intern/nodes/deg_node_component.h"
+#include "intern/nodes/deg_node_operation.h"
 
-#include "depsnode.h"
-#include "depsnode_component.h"
-#include "depsnode_operation.h"
 #include "depsgraph_debug.h"
 #include "depsgraph_intern.h"
 #include "depsgraph_types.h"
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index 37f61a7..391326c 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -43,8 +43,8 @@
 #include "BLI_string.h"
 
 #include "intern/depsgraph_types.h"
-#include "intern/depsnode.h"
-#include "intern/depsnode_operation.h"
+#include "intern/nodes/deg_node.h"
+#include "intern/nodes/deg_node_operation.h"
 
 struct Base;
 struct bGPdata;
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc
index 87dbb23..994a564 100644
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@ -51,9 +51,11 @@ extern "C" {
 
 #include "DEG_depsgraph.h"
 #include "depsgraph.h" /* own include */
-#include "depsnode.h"
-#include "depsnode_operation.h"
-#include "depsnode_component.h"
+
+#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"
 
diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc
index 86b12d8..fb6b795 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build.cc
@@ -48,10 +48,11 @@ extern "C" {
 #include "builder/deg_builder_nodes.h"
 #include "builder/deg_builder_relations.h"
 
-#include "depsnode.h"
-#include "depsnode_component.h"
+#include "intern/nodes/deg_node.h"
+#include "intern/nodes/deg_node_component.h"
+#include "intern/nodes/deg_node_operation.h"
+
 #include "depsgraph_debug.h"
-#include "depsnode_operation.h"
 #include "depsgraph_types.h"
 #include "depsgraph_intern.h"
 
diff --git a/source/blender/depsgraph/intern/depsgraph_debug.cc b/source/blender/depsgraph/intern/depsgraph_debug.cc
index ec02430..2545edb 100644
--- a/source/blender/depsgraph/intern/depsgraph_debug.cc
+++ b/source/blender/depsgraph/intern/depsgraph_debug.cc
@@ -38,11 +38,12 @@ extern "C" {
 #include "DEG_depsgraph_build.h"
 }  /* extern "C" */
 
+#include "intern/nodes/deg_node.h"
+#include "intern/nodes/deg_node_component.h"
+#include "intern/nodes/deg_node_operation.h"
+
 #include "eval/deg_eval_debug.h"
 #include "depsgraph_debug.h"
-#include "depsnode.h"
-#include "depsnode_component.h"
-#include "depsnode_operation.h"
 #include "depsgraph_intern.h"
 #include "depsgraph_util_foreach.h"
 
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc
index 29a1b22..6210e38 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cc
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cc
@@ -43,8 +43,11 @@ extern "C" {
 
 #include "eval/deg_eval.h"
 #include "eval/deg_eval_flush.h"
+
+#include "intern/nodes/deg_node.h"
+#include "intern/nodes/deg_node_operation.h"
+
 #include "depsgraph.h"
-#include "depsnode_operation.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 ffaab1c..5e49891 100644
--- a/source/blender/depsgraph/intern/depsgraph_intern.h
+++ b/source/blender/depsgraph/intern/depsgraph_intern.h
@@ -37,8 +37,10 @@
 
 #include "MEM_guardedalloc.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 "depsnode.h"
 
 struct Main;
 struct Group;
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index e063c22..0dd7eb7 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -56,10 +56,12 @@ extern "C" {
 } /* extern "C" */
 
 #include "eval/deg_eval_flush.h"
+
+#include "intern/nodes/deg_node.h"
+#include "intern/nodes/deg_node_component.h"
+#include "intern/nodes/deg_node_operation.h"
+
 #include "depsgraph_debug.h"
-#include "depsnode.h"
-#include "depsnode_component.h"
-#include "depsnode_operation.h"
 #include "depsgraph_intern.h"
 #include "depsgraph_util_foreach.h"
 
diff --git a/source/blender/depsgraph/intern/depsgraph_type_defines.cc b/source/blender/depsgraph/intern/depsgraph_type_defines.cc
index 84c3d37..2449f3b 100644
--- a/source/blender/depsgraph/intern/depsgraph_type_defines.cc
+++ b/source/blender/depsgraph/intern/depsgraph_type_defines.cc
@@ -39,10 +39,11 @@ extern "C" {
 #include "DEG_depsgraph.h"
 } /* extern "C" */
 
+#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 "depsnode.h"
-#include "depsnode_component.h"
-#include "depsnode_operation.h"
 
 /* ************ */
 /* External API */
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc
index ba4ae6a..1cb91f6 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@ -48,10 +48,10 @@ extern "C" {
 
 #include "eval/deg_eval_debug.h"
 #include "eval/deg_eval_flush.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 "depsnode.h"
-#include "depsnode_component.h"
-#include "depsnode_operation.h"
 #include "depsgraph_debug.h"
 #include "depsgraph_util_foreach.h"
 
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_debug.cc b/source/blender/depsgraph/intern/eval/deg_eval_debug.cc
index b8dbd2b..eb6888a 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_debug.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_debug.cc
@@ -42,9 +42,10 @@ extern "C" {
 #include "WM_types.h"
 }  /* extern "C" */
 
-#include "depsnode.h"
-#include "depsnode_component.h"
-#include "depsnode_operation.h"
+#include "intern/nodes/deg_node.h"
+#include "intern/nodes/deg_node_component.h"
+#include "intern/nodes/deg_node_operation.h"
+
 #include "depsgraph_intern.h"
 
 namespace DEG {
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index 9804567..39e9b49 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -43,9 +43,10 @@ extern "C" {
 #include "DEG_depsgraph.h"
 } /* extern "C" */
 
-#include "depsnode.h"
-#include "depsnode_component.h"
-#include "depsnode_operation.h"
+#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"
 
diff --git a/source/blender/depsgraph/intern/depsnode.cc b/source/blender/depsgraph/intern/nod

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list