[Bf-blender-cvs] [611771e] depsgraph_refactor: Cleanup: moved functions in depsgraph.cpp.

Lukas Tönne noreply at git.blender.org
Mon Apr 14 13:52:15 CEST 2014


Commit: 611771e2138b7f4cf84daf5acd40118e573d740f
Author: Lukas Tönne
Date:   Sun Apr 13 12:04:09 2014 +0200
https://developer.blender.org/rB611771e2138b7f4cf84daf5acd40118e573d740f

Cleanup: moved functions in depsgraph.cpp.

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

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

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

diff --git a/source/blender/depsgraph/intern/depsgraph.cpp b/source/blender/depsgraph/intern/depsgraph.cpp
index db76d6e..87b3153 100644
--- a/source/blender/depsgraph/intern/depsgraph.cpp
+++ b/source/blender/depsgraph/intern/depsgraph.cpp
@@ -42,6 +42,24 @@ extern "C" {
 #include "depsgraph_intern.h"
 
 
+Depsgraph::Depsgraph()
+{
+	this->root_node = NULL;
+}
+
+Depsgraph::~Depsgraph()
+{
+	/* free root node - it won't have been freed yet... */
+	if (this->root_node) {
+		delete this->root_node;
+	}
+	
+	clear_id_nodes();
+	clear_subgraph_nodes();
+}
+
+/* Query Conditions from RNA ----------------------- */
+
 /* Determine node-querying criteria for finding a suitable node,
  * given a RNA Pointer (and optionally, a property too)
  */
@@ -78,8 +96,6 @@ static void find_node_criteria_from_pointer(const PointerRNA *ptr, const Propert
 	}
 }
 
-/* Query Conditions from RNA ----------------------- */
-
 /* Convenience wrapper to find node given just pointer + property */
 DepsNode *Depsgraph::find_node_from_pointer(const PointerRNA *ptr, const PropertyRNA *prop)
 {
@@ -95,7 +111,7 @@ DepsNode *Depsgraph::find_node_from_pointer(const PointerRNA *ptr, const Propert
 	return find_node(id, subdata, type, name);
 }
 
-/* Convenience Functions ---------------------------- */
+/* Node Management ---------------------------- */
 
 RootDepsNode *Depsgraph::add_root_node()
 {
@@ -220,32 +236,12 @@ DepsRelation::~DepsRelation()
 /* ************************************************** */
 /* Public Graph API */
 
-Depsgraph::Depsgraph()
-{
-	this->root_node = NULL;
-}
-
-Depsgraph::~Depsgraph()
-{
-	/* free root node - it won't have been freed yet... */
-	if (this->root_node) {
-		delete this->root_node;
-	}
-	
-	clear_id_nodes();
-	clear_subgraph_nodes();
-}
-
-/* Init --------------------------------------------- */
-
 /* Initialise a new Depsgraph */
 Depsgraph *DEG_graph_new()
 {
 	return new Depsgraph;
 }
 
-/* Freeing ------------------------------------------- */
-
 /* Free graph's contents and graph itself */
 void DEG_graph_free(Depsgraph *graph)
 {




More information about the Bf-blender-cvs mailing list