[Bf-blender-cvs] [d30353a] depsgraph_refactor: Removed unused RNA-based get_node variants (from_pointer, from_rna_path).

Lukas Tönne noreply at git.blender.org
Sat Apr 12 10:48:56 CEST 2014


Commit: d30353a02aef1dc214e35da3f0a181c3afe54029
Author: Lukas Tönne
Date:   Sat Apr 12 10:41:59 2014 +0200
https://developer.blender.org/rBd30353a02aef1dc214e35da3f0a181c3afe54029

Removed unused RNA-based get_node variants (from_pointer, from_rna_path).

Only the find_node variants are needed (for tagging), build functions
for RNA paths have their own implementation in the builder classes.

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

M	source/blender/depsgraph/intern/depsgraph.cpp
M	source/blender/depsgraph/intern/depsgraph.h

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

diff --git a/source/blender/depsgraph/intern/depsgraph.cpp b/source/blender/depsgraph/intern/depsgraph.cpp
index 8b69208..453e888 100644
--- a/source/blender/depsgraph/intern/depsgraph.cpp
+++ b/source/blender/depsgraph/intern/depsgraph.cpp
@@ -99,44 +99,6 @@ DepsNode *Depsgraph::get_node(const ID *id, const string &subdata, eDepsNode_Typ
 	return node;
 }
 
-/* Get the most appropriate node referred to by pointer + property */
-DepsNode *Depsgraph::get_node_from_pointer(const PointerRNA *ptr, const PropertyRNA *prop)
-{
-	DepsNode *node = NULL;
-	
-	ID *id;
-	eDepsNode_Type type;
-	string subdata;
-	string name;
-	
-	/* get querying conditions */
-	find_node_criteria_from_pointer(ptr, prop, &id, &subdata, &type, &name);
-	
-	/* use standard lookup mechanisms... */
-	node = get_node(id, subdata, type, name);
-	return node;
-}
-
-/* Get DepsNode referred to by data path */
-DepsNode *Depsgraph::get_node_from_rna_path(const ID *id, const string &path)
-{
-	PointerRNA id_ptr, ptr;
-	PropertyRNA *prop = NULL;
-	DepsNode *node = NULL;
-	
-	/* create ID pointer for root of path lookup */
-	RNA_id_pointer_create((ID *)id, &id_ptr);
-	
-	/* try to resolve path... */
-	if (RNA_path_resolve(&id_ptr, path.c_str(), &ptr, &prop)) {
-		/* get matching node... */
-		node = this->get_node_from_pointer(&ptr, prop);
-	}
-	
-	/* return node found */
-	return node;
-}
-
 /* Add ------------------------------------------------ */
 
 /* Add a new node */
diff --git a/source/blender/depsgraph/intern/depsgraph.h b/source/blender/depsgraph/intern/depsgraph.h
index cdbf0b3..2f5fabf 100644
--- a/source/blender/depsgraph/intern/depsgraph.h
+++ b/source/blender/depsgraph/intern/depsgraph.h
@@ -130,20 +130,6 @@ struct Depsgraph {
 	 * > returns: A node matching the required characteristics that exists in the graph
 	 */
 	DepsNode *get_node(const ID *id, const string &subdata, eDepsNode_Type type, const string &name);
-	/* Get the most appropriate node referred to by pointer + property 
-	 * < graph: Depsgraph to find node from
-	 * < ptr: RNA Pointer to the data that we're supposed to find a node for
-	 * < (prop): optional RNA Property that is affected
-	 */
-	// XXX: returns matching outer node only, except for drivers
-	DepsNode *get_node_from_pointer(const PointerRNA *ptr, const PropertyRNA *prop);
-	/* Get the most appropriate node referred to by data path
-	 * < graph: Depsgraph to find node from
-	 * < id: ID-Block that path is rooted on
-	 * < path: RNA-Path to resolve
-	 * > returns: (IDDepsNode | DataDepsNode) as appropriate
-	 */
-	DepsNode *get_node_from_rna_path(const ID *id, const string &path);
 	
 	/* Create a new node and add to graph
 	 * ! Arguments are as for DEG_find_node()




More information about the Bf-blender-cvs mailing list