[Bf-blender-cvs] [d974d254975] master: Depsgraph: Cleanup, move RNA key constructor to it's file

Sergey Sharybin noreply at git.blender.org
Mon Dec 4 14:49:30 CET 2017


Commit: d974d254975df7aae20804f189b64c0741d52ba1
Author: Sergey Sharybin
Date:   Mon Dec 4 12:59:44 2017 +0100
Branches: master
https://developer.blender.org/rBd974d254975df7aae20804f189b64c0741d52ba1

Depsgraph: Cleanup, move RNA key constructor to it's file

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

M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M	source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 064be03d7d4..275c6847e43 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -202,20 +202,6 @@ static bool object_particles_depends_on_time(Object *object)
 
 /* **** General purpose functions ****  */
 
-RNAPathKey::RNAPathKey(ID *id, const char *path) :
-    id(id)
-{
-	/* create ID pointer for root of path lookup */
-	PointerRNA id_ptr;
-	RNA_id_pointer_create(id, &id_ptr);
-	/* try to resolve path... */
-	int index;
-	if (!RNA_path_resolve_full(&id_ptr, path, &this->ptr, &this->prop, &index)) {
-		this->ptr = PointerRNA_NULL;
-		this->prop = NULL;
-	}
-}
-
 DepsgraphRelationBuilder::DepsgraphRelationBuilder(Main *bmain,
                                                    Depsgraph *graph)
     : bmain_(bmain),
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc
index 9d6ab3358a7..f6845aa697c 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc
@@ -193,6 +193,20 @@ RNAPathKey::RNAPathKey(ID *id, const PointerRNA &ptr, PropertyRNA *prop)
 {
 }
 
+RNAPathKey::RNAPathKey(ID *id, const char *path)
+        : id(id)
+{
+    /* create ID pointer for root of path lookup */
+    PointerRNA id_ptr;
+    RNA_id_pointer_create(id, &id_ptr);
+    /* try to resolve path... */
+    int index;
+    if (!RNA_path_resolve_full(&id_ptr, path, &this->ptr, &this->prop, &index)) {
+	this->ptr = PointerRNA_NULL;
+	this->prop = NULL;
+    }
+}
+
 string RNAPathKey::identifier() const
 {
 	const char *id_name   = (id) ?  id->name : "<No ID>";



More information about the Bf-blender-cvs mailing list