[Bf-blender-cvs] [173b2a7] depsgraph_cleanup: Depsgraph: Remove file with just a single debug define

[Sergey Sharybin]

Commit: 173b2a72a9fce9b6cda7e8b67f902de5997ae26d
Author: Sergey Sharybin
Date:   Thu May 26 09:55:16 2016 +0200
Branches: depsgraph_cleanup
https://developer.blender.org/rB173b2a72a9fce9b6cda7e8b67f902de5997ae26d

Depsgraph: Remove file with just a single debug define

Granularity is good, but it's a bit too extreme :)

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

M	source/blender/depsgraph/CMakeLists.txt
M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M	source/blender/depsgraph/intern/depsgraph_build.cc
D	source/blender/depsgraph/intern/depsgraph_debug.h
M	source/blender/depsgraph/intern/depsgraph_intern.h
M	source/blender/depsgraph/intern/depsgraph_tag.cc
M	source/blender/depsgraph/intern/eval/deg_eval.cc
M	source/blender/depsgraph/intern/eval/deg_eval_debug.h

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

diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index c220604..31e5612 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -78,7 +78,6 @@ set(SRC
 	intern/nodes/deg_node_component.h
 	intern/nodes/deg_node_operation.h
 	intern/depsgraph.h
-	intern/depsgraph_debug.h
 	intern/depsgraph_intern.h
 	intern/depsgraph_types.h
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index f33c4cd..9330f76 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -101,7 +101,6 @@ extern "C" {
 #include "intern/nodes/deg_node_component.h"
 #include "intern/nodes/deg_node_operation.h"
 
-#include "depsgraph_debug.h"
 #include "depsgraph_intern.h"
 #include "depsgraph_types.h"
 
diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc
index ba97ee1..c1ab627 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build.cc
@@ -52,7 +52,6 @@ extern "C" {
 #include "intern/nodes/deg_node_component.h"
 #include "intern/nodes/deg_node_operation.h"
 
-#include "depsgraph_debug.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
deleted file mode 100644
index 999e84a..0000000
--- a/source/blender/depsgraph/intern/depsgraph_debug.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2013 Blender Foundation.
- * All rights reserved.
- *
- * Original Author: Joshua Leung
- * Contributor(s): None Yet
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/depsgraph/intern/depsgraph_debug.h
- *  \ingroup depsgraph
- */
-
-#pragma once
-
-#include "depsgraph_types.h"
-
-extern "C" {
-#include "BKE_global.h"
-}
-
-#define DEG_DEBUG_PRINTF(...) \
-	do { \
-		if (G.debug & G_DEBUG_DEPSGRAPH) { \
-			fprintf(stderr, __VA_ARGS__); \
-		} \
-	} while (0)
diff --git a/source/blender/depsgraph/intern/depsgraph_intern.h b/source/blender/depsgraph/intern/depsgraph_intern.h
index 8279568..c2afd15 100644
--- a/source/blender/depsgraph/intern/depsgraph_intern.h
+++ b/source/blender/depsgraph/intern/depsgraph_intern.h
@@ -37,6 +37,10 @@
 
 #include "MEM_guardedalloc.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"
@@ -107,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);
 
+#define DEG_DEBUG_PRINTF(...) \
+	do { \
+		if (G.debug & G_DEBUG_DEPSGRAPH) { \
+			fprintf(stderr, __VA_ARGS__); \
+		} \
+	} while (0)
+
 }  // namespace DEG
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index 4f5a10f..f35ac4d 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -61,7 +61,6 @@ extern "C" {
 #include "intern/nodes/deg_node_component.h"
 #include "intern/nodes/deg_node_operation.h"
 
-#include "depsgraph_debug.h"
 #include "depsgraph_intern.h"
 #include "depsgraph_util_foreach.h"
 
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc
index 1cb91f6..0f2b51b 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@ -39,6 +39,7 @@ extern "C" {
 #include "BLI_task.h"
 
 #include "BKE_depsgraph.h"
+#include "BKE_global.h"
 #include "BKE_scene.h"
 
 #include "DEG_depsgraph.h"
@@ -52,7 +53,6 @@ extern "C" {
 #include "intern/nodes/deg_node_component.h"
 #include "intern/nodes/deg_node_operation.h"
 #include "depsgraph.h"
-#include "depsgraph_debug.h"
 #include "depsgraph_util_foreach.h"
 
 /* Unfinished and unused, and takes quite some pre-processing time. */
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_debug.h b/source/blender/depsgraph/intern/eval/deg_eval_debug.h
index 8d4d08a..befb821 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_debug.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_debug.h
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/depsgraph_debug.h
+/** \file blender/depsgraph/intern/eval/deg_eval_debug.h
  *  \ingroup depsgraph
  */