[Bf-blender-cvs] [da2ad04] depsgraph_cleanup: Depsgraph: Move PChan map to a builder folder as well

Sergey Sharybin noreply at git.blender.org
Thu May 26 13:55:05 CEST 2016


Commit: da2ad04f4e401318843535bfebf44eba84a90a95
Author: Sergey Sharybin
Date:   Thu May 26 12:51:56 2016 +0200
Branches: depsgraph_cleanup
https://developer.blender.org/rBda2ad04f4e401318843535bfebf44eba84a90a95

Depsgraph: Move PChan map to a builder folder as well

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

M	source/blender/depsgraph/CMakeLists.txt
A	source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc
A	source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h
M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M	source/blender/depsgraph/intern/nodes/deg_node_operation.h
D	source/blender/depsgraph/util/depsgraph_util_pchanmap.cc
D	source/blender/depsgraph/util/depsgraph_util_pchanmap.h

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

diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index c248bd3..d2ec14f 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -43,6 +43,7 @@ set(SRC
 	intern/builder/deg_builder.cc
 	intern/builder/deg_builder_cycle.cc
 	intern/builder/deg_builder_nodes.cc
+	intern/builder/deg_builder_pchanmap.cc
 	intern/builder/deg_builder_relations.cc
 	intern/builder/deg_builder_transitive.cc
 	intern/debug/deg_debug_graphviz.cc
@@ -59,7 +60,6 @@ set(SRC
 	intern/depsgraph_query.cc
 	intern/depsgraph_tag.cc
 	intern/depsgraph_type_defines.cc
-	util/depsgraph_util_pchanmap.cc
 
 	DEG_depsgraph.h
 	DEG_depsgraph_build.h
@@ -69,6 +69,7 @@ set(SRC
 	intern/builder/deg_builder.h
 	intern/builder/deg_builder_cycle.h
 	intern/builder/deg_builder_nodes.h
+	intern/builder/deg_builder_pchanmap.h
 	intern/builder/deg_builder_relations.h
 	intern/builder/deg_builder_transitive.h
 	intern/eval/deg_eval.h
@@ -84,7 +85,6 @@ set(SRC
 	util/depsgraph_util_function.h
 	util/depsgraph_util_hash.h
 	util/depsgraph_util_map.h
-	util/depsgraph_util_pchanmap.h
 	util/depsgraph_util_set.h
 )
 
diff --git a/source/blender/depsgraph/util/depsgraph_util_pchanmap.cc b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc
similarity index 97%
rename from source/blender/depsgraph/util/depsgraph_util_pchanmap.cc
rename to source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc
index 0997463..0e78df5 100644
--- a/source/blender/depsgraph/util/depsgraph_util_pchanmap.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc
@@ -24,11 +24,11 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/util/depsgraph_util_pchanmap.cc
+/** \file blender/depsgraph/intern/builder/deg_builder_pchanmap.h
  *  \ingroup depsgraph
  */
 
-#include "depsgraph_util_pchanmap.h"
+#include "intern/builder/deg_builder_pchanmap.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/source/blender/depsgraph/util/depsgraph_util_pchanmap.h b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h
similarity index 96%
rename from source/blender/depsgraph/util/depsgraph_util_pchanmap.h
rename to source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h
index 4ea7d48..233d860 100644
--- a/source/blender/depsgraph/util/depsgraph_util_pchanmap.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/util/depsgraph_util_pchanmap.h
+/** \file blender/depsgraph/intern/builder/deg_builder_pchanmap.h
  *  \ingroup depsgraph
  */
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 5c94217..a86ba31 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -96,6 +96,7 @@ extern "C" {
 } /* extern "C" */
 
 #include "intern/builder/deg_builder.h"
+#include "intern/builder/deg_builder_pchanmap.h"
 
 #include "intern/nodes/deg_node.h"
 #include "intern/nodes/deg_node_component.h"
@@ -105,7 +106,6 @@ extern "C" {
 #include "intern/depsgraph_types.h"
 
 #include "util/depsgraph_util_foreach.h"
-#include "util/depsgraph_util_pchanmap.h"
 
 namespace DEG {
 
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_operation.h b/source/blender/depsgraph/intern/nodes/deg_node_operation.h
index 7896b67..f03078f 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_operation.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_operation.h
@@ -85,7 +85,7 @@ struct OperationDepsNode : public DepsNode {
 	bool scheduled;
 
 	/* Stage of evaluation */
-	eDepsOperation optype;
+	eDepsOperation_Type optype;
 
 	/* Identifier for the operation being performed. */
 	eDepsOperation_Code opcode;




More information about the Bf-blender-cvs mailing list