[Bf-blender-cvs] [3fe4dda] depsgraph_cleanup: Depsgraph: Some more simplification of object destruction

[Sergey Sharybin]

Commit: 3fe4dda6f3915a412e1a2c95b38fcc070e7fa781
Author: Sergey Sharybin
Date:   Thu May 26 18:01:25 2016 +0200
Branches: depsgraph_cleanup
https://developer.blender.org/rB3fe4dda6f3915a412e1a2c95b38fcc070e7fa781

Depsgraph: Some more simplification of object destruction

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

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

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

diff --git a/source/blender/depsgraph/intern/nodes/deg_node.cc b/source/blender/depsgraph/intern/nodes/deg_node.cc
index 392593c..5102ffd 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node.cc
@@ -227,8 +227,10 @@ void IDDepsNode::remove_component(eDepsNode_Type type, const string &name)
 	if (comp_node) {
 		/* Unregister. */
 		ComponentIDKey key(type, name);
-		BLI_ghash_remove(components, &key, id_deps_node_hash_key_free, NULL);
-		OBJECT_GUARDED_DELETE(comp_node, ComponentDepsNode);
+		BLI_ghash_remove(components,
+		                 &key,
+		                 id_deps_node_hash_key_free,
+		                 id_deps_node_hash_value_free);
 	}
 }
 
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.cc b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
index 95cd912..1e0da6d 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
@@ -196,8 +196,9 @@ void ComponentDepsNode::remove_operation(eDepsOperation_Code opcode, const strin
 	if (op_node) {
 		/* unregister */
 		OperationIDKey key(opcode, name);
-		BLI_ghash_remove(operations, &key, comp_node_hash_key_free, NULL);
-		OBJECT_GUARDED_DELETE(op_node, OperationDepsNode);
+		BLI_ghash_remove(operations, &key,
+		                 comp_node_hash_key_free,
+		                 comp_node_hash_key_free);
 	}
 }