1 files changed, 24 insertions, 71 deletions

diff --git a/source/blender/depsgraph/intern/depsgraph_intern.h b/source/blender/depsgraph/intern/depsgraph_intern.h
index 7fdc2454564..e5d3d1f5861 100644
--- a/source/blender/depsgraph/intern/depsgraph_intern.h
+++ b/source/blender/depsgraph/intern/depsgraph_intern.h
@@ -31,65 +31,26 @@
  * - Also, defines for "Node Type Info"
  */
 
-#ifndef __DEPSGRAPH_INTERN_H__
-#define __DEPSGRAPH_INTERN_H__
+#pragma once
 
 #include <cstdlib>
 
 #include "MEM_guardedalloc.h"
 
-#include "depsgraph.h"
-#include "depsnode.h"
+extern "C" {
+#include "BKE_global.h"
+}
+
+#include "intern/nodes/deg_node.h"
+#include "intern/nodes/deg_node_component.h"
+#include "intern/nodes/deg_node_operation.h"
+#include "intern/depsgraph.h"
 
 struct Main;
 struct Group;
 struct Scene;
 
-/* Graph Building ======================================================== */
-
-/**
- * Build depsgraph for the given group, and dump results in given graph container
- * This is usually used for building subgraphs for groups to use...
- */
-void DEG_graph_build_from_group(Depsgraph *graph, struct Main *bmain, struct Group *group);
-
-/* Build subgraph for group */
-DepsNode *DEG_graph_build_group_subgraph(Depsgraph *graph_main, struct Main *bmain, struct Group *group);
-
-/* Graph Copying ========================================================= */
-/* (Part of the Filtering API) */
-
-/**
- * Depsgraph Copying Context (dcc)
- *
- * Keeps track of node relationships/links/etc. during the copy
- * operation so that they can be safely remapped...
- */
-typedef struct DepsgraphCopyContext {
-	struct GHash *nodes_hash;   /* <DepsNode, DepsNode> mapping from src node to dst node */
-	struct GHash *rels_hash;    // XXX: same for relationships?
-
-	// XXX: filtering criteria...
-} DepsgraphCopyContext;
-
-/* Internal Filtering API ---------------------------------------------- */
-
-/* Create filtering context */
-// XXX: needs params for conditions?
-DepsgraphCopyContext *DEG_filter_init(void);
-
-/* Free filtering context once filtering is done */
-void DEG_filter_cleanup(DepsgraphCopyContext *dcc);
-
-
-/* Data Copy Operations ------------------------------------------------ */
-
-/**
- * Make a (deep) copy of provided node and it's little subgraph
- * \warning Newly created node is not added to the existing graph
- * \param dcc: Context info for helping resolve links
- */
-DepsNode *DEG_copy_node(DepsgraphCopyContext *dcc, const DepsNode *src);
+namespace DEG {
 
 /* Node Types Handling ================================================= */
 
@@ -101,8 +62,9 @@ struct DepsNodeFactory {
 	virtual eDepsNode_Class tclass() const = 0;
 	virtual const char *tname() const = 0;
 
-	virtual DepsNode *create_node(const ID *id, const string &subdata, const string &name) const = 0;
-	virtual DepsNode *copy_node(DepsgraphCopyContext *dcc, const DepsNode *copy) const = 0;
+	virtual DepsNode *create_node(const ID *id,
+	                              const string &subdata,
+	                              const string &name) const = 0;
 };
 
 template <class NodeType>
@@ -130,34 +92,18 @@ struct DepsNodeFactoryImpl : public DepsNodeFactory {
 
 		return node;
 	}
-
-	virtual DepsNode *copy_node(DepsgraphCopyContext *dcc, const DepsNode *copy) const
-	{
-		BLI_assert(copy->type == type());
-		DepsNode *node = OBJECT_GUARDED_NEW(NodeType);
-
-		/* populate base node settings */
-		node->type = type();
-		node->tclass = tclass();
-		// XXX: need to review the name here, as we can't have exact duplicates...
-		node->name = copy->name;
-
-		node->copy(dcc, static_cast<const NodeType *>(copy));
-
-		return node;
-	}
 };
 
 /* Typeinfo Management -------------------------------------------------- */
 
 /* Register typeinfo */
-void DEG_register_node_typeinfo(DepsNodeFactory *factory);
+void deg_register_node_typeinfo(DepsNodeFactory *factory);
 
 /* Get typeinfo for specified type */
-DepsNodeFactory *DEG_get_node_factory(const eDepsNode_Type type);
+DepsNodeFactory *deg_get_node_factory(const eDepsNode_Type type);
 
 /* Get typeinfo for provided node */
-DepsNodeFactory *DEG_node_get_factory(const DepsNode *node);
+DepsNodeFactory *deg_node_get_factory(const DepsNode *node);
 
 /* Editors Integration -------------------------------------------------- */
 
@@ -165,4 +111,11 @@ void deg_editors_id_update(struct Main *bmain, struct ID *id);
 
 void deg_editors_scene_update(struct Main *bmain, struct Scene *scene, bool updated);
 
-#endif  /* __DEPSGRAPH_INTERN_H__ */
+#define DEG_DEBUG_PRINTF(...) \
+	do { \
+		if (G.debug & G_DEBUG_DEPSGRAPH) { \
+			fprintf(stderr, __VA_ARGS__); \
+		} \
+	} while (0)
+
+}  // namespace DEG