[Bf-blender-cvs] [b55111f8f65] master: Cleanup: Naming of depsgraph

Sergey Sharybin noreply at git.blender.org
Tue Jan 16 16:38:52 CET 2018


Commit: b55111f8f6575490b1db91c4a8a314607acf76a7
Author: Sergey Sharybin
Date:   Tue Jan 16 16:38:39 2018 +0100
Branches: master
https://developer.blender.org/rBb55111f8f6575490b1db91c4a8a314607acf76a7

Cleanup: Naming of depsgraph

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

M	source/blender/blenkernel/intern/anim_sys.c
M	source/blender/blenkernel/intern/scene.c
M	source/blender/makesrna/intern/rna_depsgraph.c

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

diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 2c6339de500..21fb29ff06d 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -2924,7 +2924,7 @@ void BKE_animsys_eval_animdata(EvaluationContext *eval_ctx, ID *id)
 {
 	AnimData *adt = BKE_animdata_from_id(id);
 	Scene *scene = NULL; /* XXX: this is only needed for flushing RNA updates,
-	                      * which should get handled as part of the graph instead...
+	                      * which should get handled as part of the dependency graph instead...
 	                      */
 	DEBUG_PRINT("%s on %s, time=%f\n\n", __func__, id->name, (double)eval_ctx->ctime);
 	BKE_animsys_evaluate_animdata(scene, id, adt, eval_ctx->ctime, ADT_RECALC_ANIM);
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index e45d2887250..13cd991a73b 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1866,7 +1866,7 @@ void BKE_scene_update_tagged(EvaluationContext *eval_ctx, Main *bmain, Scene *sc
 	/* (re-)build dependency graph if needed */
 	for (sce_iter = scene; sce_iter; sce_iter = sce_iter->set) {
 		DAG_scene_relations_update(bmain, sce_iter);
-		/* Uncomment this to check if graph was properly tagged for update. */
+		/* Uncomment this to check if dependency graph was properly tagged for update. */
 #if 0
 #ifdef WITH_LEGACY_DEPSGRAPH
 		if (use_new_eval)
@@ -1978,7 +1978,7 @@ void BKE_scene_update_for_newframe_ex(EvaluationContext *eval_ctx, Main *bmain,
 #ifdef WITH_LEGACY_DEPSGRAPH
 	bool use_new_eval = !DEG_depsgraph_use_legacy();
 #else
-	/* TODO(sergey): Pass to evaluation routines instead of storing layer in the graph? */
+	/* TODO(sergey): Pass to evaluation routines instead of storing layer in the dependency graph? */
 	(void) do_invisible_flush;
 #endif
 
diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c
index 1091239805f..c6b18d8d387 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.c
+++ b/source/blender/makesrna/intern/rna_depsgraph.c
@@ -45,18 +45,18 @@
 #include "DEG_depsgraph_build.h"
 #include "DEG_depsgraph_debug.h"
 
-static void rna_Depsgraph_debug_relations_graphviz(Depsgraph *graph,
+static void rna_Depsgraph_debug_relations_graphviz(Depsgraph *depsgraph,
                                                    const char *filename)
 {
 	FILE *f = fopen(filename, "w");
 	if (f == NULL) {
 		return;
 	}
-	DEG_debug_relations_graphviz(graph, f, "Depsgraph");
+	DEG_debug_relations_graphviz(depsgraph, f, "Depsgraph");
 	fclose(f);
 }
 
-static void rna_Depsgraph_debug_stats_gnuplot(Depsgraph *graph,
+static void rna_Depsgraph_debug_stats_gnuplot(Depsgraph *depsgraph,
                                               const char *filename,
                                               const char *output_filename)
 {
@@ -64,19 +64,19 @@ static void rna_Depsgraph_debug_stats_gnuplot(Depsgraph *graph,
 	if (f == NULL) {
 		return;
 	}
-	DEG_debug_stats_gnuplot(graph, f, "Timing Statistics", output_filename);
+	DEG_debug_stats_gnuplot(depsgraph, f, "Timing Statistics", output_filename);
 	fclose(f);
 }
 
-static void rna_Depsgraph_debug_tag_update(Depsgraph *graph)
+static void rna_Depsgraph_debug_tag_update(Depsgraph *depsgraph)
 {
-	DEG_graph_tag_relations_update(graph);
+	DEG_graph_tag_relations_update(depsgraph);
 }
 
-static void rna_Depsgraph_debug_stats(Depsgraph *graph, char *result)
+static void rna_Depsgraph_debug_stats(Depsgraph *depsgraph, char *result)
 {
 	size_t outer, ops, rels;
-	DEG_stats_simple(graph, &outer, &ops, &rels);
+	DEG_stats_simple(depsgraph, &outer, &ops, &rels);
 	BLI_snprintf(result, STATS_MAX_SIZE,
 	            "Approx %lu Operations, %lu Relations, %lu Outer Nodes",
 	            ops, rels, outer);



More information about the Bf-blender-cvs mailing list