From 7de3c8ace786d56e1f73851cdc85b1413658bba3 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Tue, 5 Dec 2017 11:35:28 +0100
Subject: Depsgraph: Move implementation part of relations header to own file

---
 .../intern/builder/deg_builder_relations.h         | 120 +--------------------
 1 file changed, 2 insertions(+), 118 deletions(-)

(limited to 'source/blender/depsgraph/intern/builder/deg_builder_relations.h')

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index 2b2e133e98e..5bfd3341662 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -299,123 +299,7 @@ struct DepsNodeHandle
 	const char *default_name;
 };
 
-/* Utilities for Builders ----------------------------------------------------- */
-
-template <typename KeyType>
-OperationDepsNode *DepsgraphRelationBuilder::find_operation_node(const KeyType& key)
-{
-	DepsNode *node = get_node(key);
-	return node != NULL ? node->get_exit_operation() : NULL;
-}
-
-template <typename KeyFrom, typename KeyTo>
-void DepsgraphRelationBuilder::add_relation(const KeyFrom &key_from,
-                                            const KeyTo &key_to,
-                                            const char *description)
-{
-	DepsNode *node_from = get_node(key_from);
-	DepsNode *node_to = get_node(key_to);
-	OperationDepsNode *op_from = node_from ? node_from->get_exit_operation() : NULL;
-	OperationDepsNode *op_to = node_to ? node_to->get_entry_operation() : NULL;
-	if (op_from && op_to) {
-		add_operation_relation(op_from, op_to, description);
-	}
-	else {
-		if (!op_from) {
-			/* XXX TODO handle as error or report if needed */
-			fprintf(stderr, "add_relation(%s) - Could not find op_from (%s)\n",
-			        description, key_from.identifier().c_str());
-		}
-		else {
-			fprintf(stderr, "add_relation(%s) - Failed, but op_from (%s) was ok\n",
-			        description, key_from.identifier().c_str());
-		}
-		if (!op_to) {
-			/* XXX TODO handle as error or report if needed */
-			fprintf(stderr, "add_relation(%s) - Could not find op_to (%s)\n",
-			        description, key_to.identifier().c_str());
-		}
-		else {
-			fprintf(stderr, "add_relation(%s) - Failed, but op_to (%s) was ok\n",
-			        description, key_to.identifier().c_str());
-		}
-	}
-}
-
-template <typename KeyTo>
-void DepsgraphRelationBuilder::add_relation(const TimeSourceKey &key_from,
-                                            const KeyTo &key_to,
-                                            const char *description)
-{
-	TimeSourceDepsNode *time_from = get_node(key_from);
-	DepsNode *node_to = get_node(key_to);
-	OperationDepsNode *op_to = node_to ? node_to->get_entry_operation() : NULL;
-	if (time_from != NULL && op_to != NULL) {
-		add_time_relation(time_from, op_to, description);
-	}
-}
-
-template <typename KeyType>
-void DepsgraphRelationBuilder::add_node_handle_relation(
-        const KeyType &key_from,
-        const DepsNodeHandle *handle,
-        const char *description)
-{
-	DepsNode *node_from = get_node(key_from);
-	OperationDepsNode *op_from = node_from ? node_from->get_exit_operation() : NULL;
-	OperationDepsNode *op_to = handle->node->get_entry_operation();
-	if (op_from != NULL && op_to != NULL) {
-		add_operation_relation(op_from, op_to, description);
-	}
-	else {
-		if (!op_from) {
-			fprintf(stderr, "add_node_handle_relation(%s) - Could not find op_from (%s)\n",
-			        description, key_from.identifier().c_str());
-		}
-		if (!op_to) {
-			fprintf(stderr, "add_node_handle_relation(%s) - Could not find op_to (%s)\n",
-			        description, key_from.identifier().c_str());
-		}
-	}
-}
+}  // namespace DEG
 
-template <typename KeyType>
-DepsNodeHandle DepsgraphRelationBuilder::create_node_handle(
-        const KeyType &key,
-        const char *default_name)
-{
-	return DepsNodeHandle(this, get_node(key), default_name);
-}
 
-/* Rig compatibility: we check if bone is using local transform as a variable
- * for driver on itself and ignore those relations to avoid "false-positive"
- * dependency cycles.
- */
-template <typename KeyFrom, typename KeyTo>
-bool DepsgraphRelationBuilder::is_same_bone_dependency(const KeyFrom& key_from,
-                                                       const KeyTo& key_to)
-{
-	/* Get operations for requested keys. */
-	DepsNode *node_from = get_node(key_from);
-	DepsNode *node_to = get_node(key_to);
-	if (node_from == NULL || node_to == NULL) {
-		return false;
-	}
-	OperationDepsNode *op_from = node_from->get_exit_operation();
-	OperationDepsNode *op_to = node_to->get_entry_operation();
-	if (op_from == NULL || op_to == NULL) {
-		return false;
-	}
-	/* We are only interested in relations like BONE_DONE -> BONE_LOCAL... */
-	if (!(op_from->opcode == DEG_OPCODE_BONE_DONE &&
-	      op_to->opcode == DEG_OPCODE_BONE_LOCAL)) {
-		return false;
-	}
-	/* ... BUT, we also need to check if it's same bone.  */
-	if (!STREQ(op_from->owner->name, op_to->owner->name)) {
-		return false;
-	}
-	return true;
-}
-
-}  // namespace DEG
+#include "intern/builder/deg_builder_relations_impl.h"
-- 
cgit v1.2.3