Commit: d988eae6f983c5ac148786689f75b95c4fa16dee
Author: Sergey Sharybin
Date: Thu Dec 21 12:56:44 2017 +0100
Branches: master
https://developer.blender.org/rBd988eae6f983c5ac148786689f75b95c4fa16dee
Depsgraph: Make it more clear that we dump relations into graphviz
We might implement other things to dump into graphviz, so better to
start having explicit names.
===================================================================
M source/blender/blenkernel/intern/depsgraph.c
M source/blender/depsgraph/CMakeLists.txt
M source/blender/depsgraph/DEG_depsgraph_debug.h
R098 source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
M source/blender/makesrna/intern/rna_depsgraph.c
===================================================================
diff --git a/source/blender/blenkernel/intern/depsgraph.c
b/source/blender/blenkernel/intern/depsgraph.c
index 985c758d5cb..3a528d4b847 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -3704,7 +3704,7 @@ void DAG_print_dependencies(Main *UNUSED(bmain),
Scene *scene,
Object *UNUSED(ob))
{
- DEG_debug_graphviz(scene->depsgraph, stdout, "Depsgraph");
+ DEG_debug_relations_graphviz(scene->depsgraph, stdout, "Depsgraph");
}
#endif
diff --git a/source/blender/depsgraph/CMakeLists.txt
b/source/blender/depsgraph/CMakeLists.txt
index 232fc93aeb4..04fbbbf0915 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -51,7 +51,7 @@ set(SRC
intern/builder/deg_builder_relations_rig.cc
intern/builder/deg_builder_relations_scene.cc
intern/builder/deg_builder_transitive.cc
- intern/debug/deg_debug_graphviz.cc
+ intern/debug/deg_debug_relations_graphviz.cc
intern/eval/deg_eval.cc
intern/eval/deg_eval_flush.cc
intern/nodes/deg_node.cc
diff --git a/source/blender/depsgraph/DEG_depsgraph_debug.h
b/source/blender/depsgraph/DEG_depsgraph_debug.h
index 7d96b9ed602..e920e34dad3 100644
--- a/source/blender/depsgraph/DEG_depsgraph_debug.h
+++ b/source/blender/depsgraph/DEG_depsgraph_debug.h
@@ -51,7 +51,9 @@ void DEG_stats_simple(const struct Depsgraph *graph,
/* ************************************************ */
/* Diagram-Based Graph Debugging */
-void DEG_debug_graphviz(const struct Depsgraph *graph, FILE *stream, const
char *label);
+void DEG_debug_relations_graphviz(const struct Depsgraph *graph,
+ FILE *stream,
+ const char *label);
/* ************************************************ */
diff --git a/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
similarity index 98%
rename from source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
rename to source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
index 88954f6f0dc..ca7e9c5c40c 100644
--- a/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
+++ b/source/blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
@@ -24,7 +24,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/depsgraph/intern/debug/deg_debug_graphviz.cc
+/** \file blender/depsgraph/intern/debug/deg_debug_relations_graphviz.cc
* \ingroup depsgraph
*
* Implementation of tools for debugging the depsgraph
@@ -518,7 +518,9 @@ static void deg_debug_graphviz_graph_relations(const
DebugContext &ctx,
} // namespace DEG
-void DEG_debug_graphviz(const Depsgraph *graph, FILE *f, const char *label)
+void DEG_debug_relations_graphviz(const Depsgraph *graph,
+ FILE *f,
+ const char *label)
{
if (!graph) {
return;
diff --git a/source/blender/makesrna/intern/rna_depsgraph.c
b/source/blender/makesrna/intern/rna_depsgraph.c
index 14668001428..041f01b6543 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.c
+++ b/source/blender/makesrna/intern/rna_depsgraph.c
@@ -45,13 +45,13 @@
#include "DEG_depsgraph_build.h"
#include "DEG_depsgraph_debug.h"
-static void rna_Depsgraph_debug_graphviz(Depsgraph *graph, const char
*filename)
+static void rna_Depsgraph_debug_relations_graphviz(Depsgraph *graph, const
char *filename)
{
FILE *f = fopen(filename, "w");
if (f == NULL) {
return;
}
- DEG_debug_graphviz(graph, f, "Depsgraph");
+ DEG_debug_relations_graphviz(graph, f, "Depsgraph");
fclose(f);
}
@@ -80,7 +80,7 @@ static void rna_def_depsgraph(BlenderRNA *brna)
srna = RNA_def_struct(brna, "Depsgraph", NULL);
RNA_def_struct_ui_text(srna, "Dependency Graph", "");
- func = RNA_def_function(srna, "debug_graphviz",
"rna_Depsgraph_debug_graphviz");
+ func = RNA_def_function(srna, "debug_relations_graphviz",
"rna_Depsgraph_debug_relations_graphviz");
parm = RNA_def_string_file_path(func, "filename", NULL, FILE_MAX, "File
Name",
"File in which to store graphviz debug
output");
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
