[Bf-blender-cvs] [c967d7d] depsgraph_refactor: Depsgraph: Code cleanup, comments
Sergey Sharybin
noreply at git.blender.org
Mon Mar 16 14:34:54 CET 2015
Commit: c967d7dbde42f7008dc2641d15b7a1b6f7c6c856
Author: Sergey Sharybin
Date: Mon Mar 16 17:43:50 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rBc967d7dbde42f7008dc2641d15b7a1b6f7c6c856
Depsgraph: Code cleanup, comments
===================================================================
M source/blender/depsgraph/intern/depsgraph.cpp
M source/blender/depsgraph/intern/depsgraph.h
M source/blender/depsgraph/intern/depsgraph_build.cpp
M source/blender/depsgraph/intern/depsgraph_build.h
M source/blender/depsgraph/intern/depsgraph_build_idusers.cpp
M source/blender/depsgraph/intern/depsgraph_debug_ogdf.cpp
M source/blender/depsgraph/intern/depsgraph_eval.h
M source/blender/depsgraph/intern/depsgraph_query.cpp
M source/blender/depsgraph/intern/depsgraph_queue.cpp
M source/blender/depsgraph/intern/depsgraph_queue.h
M source/blender/depsgraph/intern/depsgraph_tag.cpp
M source/blender/depsgraph/intern/depsgraph_type_defines.cpp
M source/blender/depsgraph/intern/depsgraph_types.h
M source/blender/depsgraph/intern/depsnode.cpp
M source/blender/depsgraph/intern/depsnode.h
M source/blender/depsgraph/intern/depsnode_component.cpp
M source/blender/depsgraph/intern/depsnode_component.h
M source/blender/depsgraph/intern/depsnode_operation.cpp
M source/blender/depsgraph/intern/depsnode_operation.h
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph.cpp b/source/blender/depsgraph/intern/depsgraph.cpp
index a293967..ca45549 100644
--- a/source/blender/depsgraph/intern/depsgraph.cpp
+++ b/source/blender/depsgraph/intern/depsgraph.cpp
@@ -359,7 +359,7 @@ DepsRelation *Depsgraph::add_new_relation(DepsNode *from, DepsNode *to,
return rel;
}
-/* ************************************************** */
+/* ************************ */
/* Relationships Management */
DepsRelation::DepsRelation(DepsNode *from,
@@ -431,7 +431,7 @@ void Depsgraph::clear_all_nodes()
}
}
-/* ************************************************** */
+/* **************** */
/* Public Graph API */
/* Initialise a new Depsgraph */
diff --git a/source/blender/depsgraph/intern/depsgraph.h b/source/blender/depsgraph/intern/depsgraph.h
index 7cc9677..64dfea7 100644
--- a/source/blender/depsgraph/intern/depsgraph.h
+++ b/source/blender/depsgraph/intern/depsgraph.h
@@ -51,7 +51,7 @@ struct SubgraphDepsNode;
struct ComponentDepsNode;
struct OperationDepsNode;
-/* ************************************* */
+/* *************************** */
/* Relationships Between Nodes */
/* Settings/Tags on Relationship */
@@ -85,7 +85,7 @@ struct DepsRelation {
~DepsRelation();
};
-/* ************************************* */
+/* ********* */
/* Depsgraph */
/* Dependency Graph object */
@@ -213,6 +213,4 @@ struct Depsgraph {
} \
}
-/* ************************************* */
-
-#endif // __DEPSGRAPH_H__
+#endif /* __DEPSGRAPH_H__ */
diff --git a/source/blender/depsgraph/intern/depsgraph_build.cpp b/source/blender/depsgraph/intern/depsgraph_build.cpp
index a803309..9ab8755 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_build.cpp
@@ -99,7 +99,7 @@ extern "C" {
#include "depsgraph_eval.h"
#include "depsgraph_intern.h"
-/* ************************************************* */
+/* ****************** */
/* External Build API */
static eDepsNode_Type deg_build_scene_component_type(eDepsSceneComponentType component)
@@ -165,7 +165,7 @@ void DEG_add_special_eval_flag(Depsgraph *graph, ID *id, short flag)
id_node->eval_flags |= flag;
}
-/* ************************************************* */
+/* ********************** */
/* Utilities for Builders */
/* Get unique identifier for FCurves and Drivers */
@@ -455,7 +455,7 @@ static void deg_graph_detect_cycles(Depsgraph *graph)
}
}
-/* ************************************************* */
+/* ******************** */
/* Graph Building API's */
/* Build depsgraph for the given scene, and dump results in given graph container */
diff --git a/source/blender/depsgraph/intern/depsgraph_build.h b/source/blender/depsgraph/intern/depsgraph_build.h
index 37309f0..447a934 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.h
+++ b/source/blender/depsgraph/intern/depsgraph_build.h
@@ -407,4 +407,4 @@ DepsNodeHandle DepsgraphRelationBuilder::create_node_handle(const KeyType &key,
return DepsNodeHandle(this, find_node(key), default_name);
}
-#endif // __DEPSGRAPH_BUILD_H__ */
+#endif /* __DEPSGRAPH_BUILD_H__ */
diff --git a/source/blender/depsgraph/intern/depsgraph_build_idusers.cpp b/source/blender/depsgraph/intern/depsgraph_build_idusers.cpp
index c756822..e9c1dae 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_idusers.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_build_idusers.cpp
@@ -216,5 +216,3 @@ void DepsgraphIDUsersBuilder::build_object(Scene *scene, Object *ob)
/* dupligroups? */
}
-
-/* ******************************************** */
diff --git a/source/blender/depsgraph/intern/depsgraph_debug_ogdf.cpp b/source/blender/depsgraph/intern/depsgraph_debug_ogdf.cpp
index ba0cee4..2579bc8 100644
--- a/source/blender/depsgraph/intern/depsgraph_debug_ogdf.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_debug_ogdf.cpp
@@ -68,7 +68,7 @@ extern "C" {
#include "depsgraph_types.h"
#include "depsgraph_intern.h"
-/* ****************** */
+/* ************** */
/* OGDF Debugging */
/* Typedef for mapping from Depsgraph Nodes to OGDF Nodes */
@@ -517,6 +517,3 @@ void DEG_debug_ogdf(const Depsgraph *graph, const char *filename)
printf("Exporting GML to '%s'...\n", filename);
GA.writeGML(filename);
}
-
-/* ****************** */
-
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.h b/source/blender/depsgraph/intern/depsgraph_eval.h
index 1b0db0e..2fc2634 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.h
+++ b/source/blender/depsgraph/intern/depsgraph_eval.h
@@ -41,7 +41,7 @@ struct OperationDepsNode;
* effectively prohibits parallelism and is quite clumsy
*/
#if 0
-/* ****************************************** */
+/* ****************** */
/* Operation Contexts */
/* Generic Operations Context
diff --git a/source/blender/depsgraph/intern/depsgraph_query.cpp b/source/blender/depsgraph/intern/depsgraph_query.cpp
index 2475cef..d324ec3 100644
--- a/source/blender/depsgraph/intern/depsgraph_query.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_query.cpp
@@ -42,7 +42,7 @@ extern "C" {
#include "depsnode_operation.h"
#include "depsgraph_intern.h"
-/* ************************************************ */
+/* ************************* */
/* Low-Level Graph Traversal */
/* Prepare for graph traversal, by tagging nodes, etc. */
@@ -102,7 +102,7 @@ static void DEG_graph_traverse_from_node(Depsgraph *graph, OperationDepsNode *st
DEG_queue_free(q);
}
-/* ************************************************ */
+/* ************************************************************** */
/* Filtering API - Basically, making a copy of the existing graph */
/* Create filtering context */
diff --git a/source/blender/depsgraph/intern/depsgraph_queue.cpp b/source/blender/depsgraph/intern/depsgraph_queue.cpp
index 8766355..351d4ed 100644
--- a/source/blender/depsgraph/intern/depsgraph_queue.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_queue.cpp
@@ -38,7 +38,7 @@ extern "C" {
#include "depsgraph_queue.h"
-/* ********************************************************* */
+/* ****************************** */
/* Depsgraph Queue implementation */
/* Data Management ----------------------------------------- */
@@ -171,6 +171,3 @@ void *DEG_queue_pop(DepsgraphQueue *q)
return BLI_heap_popmin(q->ready_heap);
}
}
-
-/* ********************************************************* */
-
diff --git a/source/blender/depsgraph/intern/depsgraph_queue.h b/source/blender/depsgraph/intern/depsgraph_queue.h
index 2b0d04b..bd294d4 100644
--- a/source/blender/depsgraph/intern/depsgraph_queue.h
+++ b/source/blender/depsgraph/intern/depsgraph_queue.h
@@ -66,7 +66,7 @@ typedef struct DepsgraphQueue {
size_t tot; /* total number of nodes which have passed through queue; mainly for debug */
} DepsgraphQueue;
-/* *********************************************** */
+/* ************************** */
/* Depsgraph Queue Operations */
/* Data management */
@@ -84,7 +84,4 @@ bool DEG_queue_is_empty(DepsgraphQueue *q);
void DEG_queue_push(DepsgraphQueue *q, void *dnode, float cost = 0.0f);
void *DEG_queue_pop(DepsgraphQueue *q);
-/* *********************************************** */
-
-#endif // DEPSGRAPH_QUEUE_H
-
+#endif /* DEPSGRAPH_QUEUE_H */
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cpp b/source/blender/depsgraph/intern/depsgraph_tag.cpp
index 0c6ba48..c780e0d 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cpp
@@ -54,7 +54,7 @@ unsigned int BKE_screen_visible_layers(bScreen *screen, Scene *scene);
#include "depsnode_operation.h"
#include "depsgraph_intern.h"
-/* ************************************************** */
+/* *********************** */
/* Update Tagging/Flushing */
/* Data-Based Tagging ------------------------------- */
diff --git a/source/blender/depsgraph/intern/depsgraph_type_defines.cpp b/source/blender/depsgraph/intern/depsgraph_type_defines.cpp
index fa3e171..789f632 100644
--- a/source/blender/depsgraph/intern/depsgraph_type_defines.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_type_defines.cpp
@@ -38,7 +38,7 @@ extern "C" {
#include "depsnode_component.h"
#include "depsnode_operation.h"
-/* ******************************************************** */
+/* ************ */
/* External API */
/* Global type registry */
@@ -95,5 +95,3 @@ DepsNodeFactory *DEG_node_get_factory(const DepsNode *node)
return DEG_get_node_factory(node->type);
}
-
-/* ******************************************************** */
diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h
index abd843e..9acb7b2 100644
--- a/source/blender/depsgraph/intern/depsgraph_types.h
+++ b/source/blender/depsgraph/intern/depsgraph_types.h
@@ -166,4 +166,4 @@ typedef enum eDepsRelation_Type {
DEPSREL_TYPE_UPDATE_UI,
} eDepsRelation_Type;
-#endif // __DEPSGRAPH_TYPES_H__
+#endif /* __DEPSGRAPH_TYPES_H__ */
diff --git a/source/blender/depsgraph/intern/depsnode.cpp b/source/blender/depsgraph/intern/depsnode.cpp
index a2bf499..3206058 100644
--- a/source/blender/depsgraph/intern/depsnode.cpp
+++ b/source/blender/depsgraph/intern/depsnode.cpp
@@ -39,7 +39,7 @@ extern "C" {
#include "depsnode_operation.h"
#include "depsgraph_intern.h"
-/* ************************************************** */
+/* *************** */
/* Node Management */
/* Add ------------------------------------------------ */
@@ -90,7 +90,7 @@ string DepsNode::identifier() const
return string(typebuf) + " : " + name;
}
-/* ******************************************************** */
+/* ************* */
/* Generic Nodes */
/* Time Source Node ============================================== */
diff --git a/source/blender/depsgraph/intern/depsnode.h b/source/blender/depsgraph/intern/depsnode.h
index c5832d8..25d04fb 100644
--- a/source/blender/depsgraph/intern/depsnode.h
+++ b/source/blender/depsgraph/intern/depsnode.h
@@ -238,8 +238,6 @@ typedef enum eSubgraphRef_Flag {
SUBG
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list