[Bf-blender-cvs] [e56d10a] depsgraph_refactor: Eval debugging: Use the eval debug callback during flushing.

[Lukas Tönne]

Commit: e56d10a2de2b0bd16eaf322a36603fc42f117018
Author: Lukas Tönne
Date:   Mon Apr 14 15:54:20 2014 +0200
https://developer.blender.org/rBe56d10a2de2b0bd16eaf322a36603fc42f117018

Eval debugging: Use the eval debug callback during flushing.

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

M       source/blender/depsgraph/intern/depsgraph_debug.cpp
M       source/blender/depsgraph/intern/depsgraph_intern.h
M       source/blender/depsgraph/intern/depsgraph_tag.cpp
M       source/blender/makesrna/intern/rna_depsgraph.c

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

diff --git a/source/blender/depsgraph/intern/depsgraph_debug.cpp 
b/source/blender/depsgraph/intern/depsgraph_debug.cpp
index 092b40b..549647a 100644
--- a/source/blender/depsgraph/intern/depsgraph_debug.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_debug.cpp
@@ -517,6 +517,12 @@ void DEG_debug_build_relation_added(const DepsRelation 
*rel)
        }
 }
 
+void DEG_debug_eval_step(const char *message)
+{
+       if (deg_debug_eval_cb)
+               deg_debug_eval_cb(deg_debug_eval_userdata, message);
+}
+
 void DEG_debug_build_end(void)
 {
        deg_debug_build_userdata = NULL;
diff --git a/source/blender/depsgraph/intern/depsgraph_intern.h 
b/source/blender/depsgraph/intern/depsgraph_intern.h
index 4097c0d..e9fab36 100644
--- a/source/blender/depsgraph/intern/depsgraph_intern.h
+++ b/source/blender/depsgraph/intern/depsgraph_intern.h
@@ -162,6 +162,7 @@ DepsNodeFactory *DEG_node_get_factory(const DepsNode *node);
 
 void DEG_debug_build_node_added(const DepsNode *node);
 void DEG_debug_build_relation_added(const DepsRelation *rel);
+void DEG_debug_eval_step(const char *message);
 
 
 #endif // __DEPSGRAPH_INTERN_H__
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cpp 
b/source/blender/depsgraph/intern/depsgraph_tag.cpp
index 1cbb26d..4fb7fbe 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cpp
@@ -85,6 +85,8 @@ void DEG_graph_flush_updates(Depsgraph *graph)
        if (graph == NULL)
                return;
        
+       DEG_debug_eval_step("Flush Begin");
+       
        /* starting from the tagged "entry" nodes, flush outwards... */
        // XXX: perhaps instead of iterating, we should just push these onto 
the queue of nodes to check?
        // NOTE: also need to ensure that for each of these, there is a path 
back to root, or else they won't be done
diff --git a/source/blender/makesrna/intern/rna_depsgraph.c 
b/source/blender/makesrna/intern/rna_depsgraph.c
index 41c2823..80008a7 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.c
+++ b/source/blender/makesrna/intern/rna_depsgraph.c
@@ -92,7 +92,7 @@ static void rna_Depsgraph_debug_simulate(Depsgraph *graph, 
const char *filename)
        DEG_debug_eval_init(&debug_info,
                            (DEG_DebugEvalCb)rna_Depsgraph_debug_simulate_cb);
        
-       /* ... TODO */
+       DEG_graph_flush_updates(graph);
        
        DEG_debug_eval_end();
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs