blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Sergey Sharybin 2017-06-12 16:55:57 +02:00
parent 109447d008 85fafccb4c
commit 2270ca9023
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/depsgraph/intern/nodes/deg_node.cc
View File

@ -204,8 +204,9 @@ void IDDepsNode::init(const ID *id, const char *UNUSED(subdata))
/* Free 'id' node. */
IDDepsNode::~IDDepsNode()
{
clear_components();
BLI_ghash_free(components, id_deps_node_hash_key_free, NULL);
BLI_ghash_free(components,
id_deps_node_hash_key_free,
id_deps_node_hash_value_free);
}
ComponentDepsNode *IDDepsNode::find_component(eDepsNode_Type type,
@ -231,26 +232,6 @@ ComponentDepsNode *IDDepsNode::add_component(eDepsNode_Type type,
return comp_node;
}
void IDDepsNode::remove_component(eDepsNode_Type type, const char *name)
{
ComponentDepsNode *comp_node = find_component(type, name);
if (comp_node) {
/* Unregister. */
ComponentIDKey key(type, name);
BLI_ghash_remove(components,
&key,
id_deps_node_hash_key_free,
id_deps_node_hash_value_free);
}
}
void IDDepsNode::clear_components()
{
BLI_ghash_clear(components,
id_deps_node_hash_key_free,
id_deps_node_hash_value_free);
}
void IDDepsNode::tag_update(Depsgraph *graph)
{
GHASH_FOREACH_BEGIN(ComponentDepsNode *, comp_node, components)

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

@ -160,8 +160,6 @@ struct IDDepsNode : public DepsNode {
const char *name = "") const;
ComponentDepsNode *add_component(eDepsNode_Type type,
const char *name = "");
void remove_component(eDepsNode_Type type, const char *name = "");
void clear_components();
void tag_update(Depsgraph *graph);