blender
/
blender
133
398
Fork 578
Code Issues 6.3k Pull Requests 746 Projects 19 Wiki Activity

Depsgraph: Remove unused argument from time source query

This commit is contained in:
Sergey Sharybin 2017-06-01 15:38:15 +02:00
parent a4925b05a7
commit 5bda458bce
4 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
View File

@ -506,7 +506,7 @@ static void deg_debug_graphviz_graph_nodes(const DebugContext &ctx,
deg_debug_graphviz_node(ctx, node);
}
GHASH_FOREACH_END();
TimeSourceDepsNode *time_source = graph->find_time_source(NULL);
TimeSourceDepsNode *time_source = graph->find_time_source();
if (time_source != NULL) {
deg_debug_graphviz_node(ctx, time_source);
}
@ -527,7 +527,7 @@ static void deg_debug_graphviz_graph_relations(const DebugContext &ctx,
}
GHASH_FOREACH_END();
TimeSourceDepsNode *time_source = graph->find_time_source(NULL);
TimeSourceDepsNode *time_source = graph->find_time_source();
if (time_source != NULL) {
deg_debug_graphviz_node_relations(ctx, time_source);
}

21
source/blender/depsgraph/intern/depsgraph.cc
View File

@ -269,25 +269,10 @@ RootDepsNode *Depsgraph::add_root_node()
return root_node;
}
TimeSourceDepsNode *Depsgraph::find_time_source(const ID *id) const
TimeSourceDepsNode *Depsgraph::find_time_source() const
{
/* Search for one attached to a particular ID? */
if (id) {
/* Check if it was added as a component
* (as may be done for subgraphs needing timeoffset).
*/
IDDepsNode *id_node = find_id_node(id);
if (id_node) {
// XXX: review this
// return id_node->find_component(DEPSNODE_TYPE_TIMESOURCE);
}
BLI_assert(!"Not implemented yet");
}
else {
/* Use "official" timesource. */
return root_node->time_source;
}
return NULL;
BLI_assert(root_node != NULL);
return root_node->time_source;
}
IDDepsNode *Depsgraph::find_id_node(const ID *id) const

2
source/blender/depsgraph/intern/depsgraph.h
View File

@ -110,7 +110,7 @@ struct Depsgraph {
RootDepsNode *add_root_node();
TimeSourceDepsNode *find_time_source(const ID *id = NULL) const;
TimeSourceDepsNode *find_time_source() const;
IDDepsNode *find_id_node(const ID *id) const;
IDDepsNode *add_id_node(ID *id, const char *name = "");

2
source/blender/depsgraph/intern/depsgraph_debug.cc
View File

@ -232,7 +232,7 @@ void DEG_stats_simple(const Depsgraph *graph, size_t *r_outer,
}
GHASH_FOREACH_END();
DEG::TimeSourceDepsNode *time_source = deg_graph->find_time_source(NULL);
DEG::TimeSourceDepsNode *time_source = deg_graph->find_time_source();
if (time_source != NULL) {
tot_rels += time_source->inlinks.size();
}