[Bf-blender-cvs] [85fafccb4c5] master: Depsgraph: Remove residue from partial updates support

[Sergey Sharybin]

Commit: 85fafccb4c55cb0b119fbdb182f63083ad9d33e4
Author: Sergey Sharybin
Date:   Mon Jun 12 16:55:04 2017 +0200
Branches: master
https://developer.blender.org/rB85fafccb4c55cb0b119fbdb182f63083ad9d33e4

Depsgraph: Remove residue from partial updates support

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

M       source/blender/depsgraph/intern/nodes/deg_node.cc
M       source/blender/depsgraph/intern/nodes/deg_node.h

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

diff --git a/source/blender/depsgraph/intern/nodes/deg_node.cc 
b/source/blender/depsgraph/intern/nodes/deg_node.cc
index 6785abbeb22..f10deaa9926 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node.cc
@@ -210,8 +210,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,
@@ -237,26 +238,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)
diff --git a/source/blender/depsgraph/intern/nodes/deg_node.h 
b/source/blender/depsgraph/intern/nodes/deg_node.h
index 354f0fd6857..1600f1fbfd3 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node.h
@@ -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);

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