blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Depsgraph: Remove redundant argument from add_id_node()

This commit is contained in:
Sergey Sharybin 2017-07-19 17:31:32 +02:00
parent e29c54674c
commit 9f9244b6ae
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@ -163,7 +163,7 @@ DepsgraphNodeBuilder::~DepsgraphNodeBuilder()
IDDepsNode *DepsgraphNodeBuilder::add_id_node(ID *id)
{
IDDepsNode *id_node = m_graph->add_id_node(id, id->name);
IDDepsNode *id_node = m_graph->add_id_node(id);
#ifdef WITH_COPY_ON_WRITE
/* Currently all ID nodes are supposed to have copy-on-write logic.
*

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

@ -279,13 +279,13 @@ IDDepsNode *Depsgraph::find_id_node(const ID *id) const
return reinterpret_cast<IDDepsNode *>(BLI_ghash_lookup(id_hash, id));
}
IDDepsNode *Depsgraph::add_id_node(ID *id, const char *name, bool do_tag)
IDDepsNode *Depsgraph::add_id_node(ID *id, bool do_tag)
{
BLI_assert((id->tag & LIB_TAG_COPY_ON_WRITE) == 0);
IDDepsNode *id_node = find_id_node(id);
if (!id_node) {
DepsNodeFactory *factory = deg_get_node_factory(DEG_NODE_TYPE_ID_REF);
id_node = (IDDepsNode *)factory->create_node(id, "", name);
id_node = (IDDepsNode *)factory->create_node(id, "", id->name);
if (do_tag) {
id->tag |= LIB_TAG_DOIT;
}
@ -462,8 +462,7 @@ ID *Depsgraph::ensure_cow_id(ID *id_orig)
/* ID is already remapped to copy-on-write. */
return id_orig;
}
/* TODO()sergey): What name we should use here? */
IDDepsNode *id_node = add_id_node(id_orig, id_orig->name, false);
IDDepsNode *id_node = add_id_node(id_orig, false);
return id_node->id_cow;
}

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

@ -114,7 +114,7 @@ struct Depsgraph {
TimeSourceDepsNode *find_time_source() const;
IDDepsNode *find_id_node(const ID *id) const;
IDDepsNode *add_id_node(ID *id, const char *name = "", bool do_tag = true);
IDDepsNode *add_id_node(ID *id, bool do_tag = true);
void clear_id_nodes();
/* Add new relationship between two nodes. */