[Bf-blender-cvs] [857a0c0] depsgraph_cleanup: Depsgraph: Don't use capital prefix for non-public functions
Sergey Sharybin
noreply at git.blender.org
Thu May 26 10:02:49 CEST 2016
Commit: 857a0c0dc7519abbffa03ca486d96164f958a452
Author: Sergey Sharybin
Date: Thu May 26 09:33:41 2016 +0200
Branches: depsgraph_cleanup
https://developer.blender.org/rB857a0c0dc7519abbffa03ca486d96164f958a452
Depsgraph: Don't use capital prefix for non-public functions
===================================================================
M source/blender/depsgraph/intern/depsgraph.cc
M source/blender/depsgraph/intern/depsgraph_intern.h
M source/blender/depsgraph/intern/depsgraph_type_defines.cc
M source/blender/depsgraph/intern/eval/deg_eval_debug.cc
M source/blender/depsgraph/intern/nodes/deg_node.cc
M source/blender/depsgraph/intern/nodes/deg_node.h
M source/blender/depsgraph/intern/nodes/deg_node_component.cc
M source/blender/depsgraph/intern/nodes/deg_node_component.h
M source/blender/depsgraph/intern/nodes/deg_node_operation.cc
M source/blender/depsgraph/intern/nodes/deg_node_operation.h
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc
index f394189..3fbf551 100644
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@ -243,7 +243,7 @@ DepsNode *Depsgraph::find_node_from_pointer(const PointerRNA *ptr,
RootDepsNode *Depsgraph::add_root_node()
{
if (!root_node) {
- DepsNodeFactory *factory = DEG_get_node_factory(DEPSNODE_TYPE_ROOT);
+ DepsNodeFactory *factory = deg_get_node_factory(DEPSNODE_TYPE_ROOT);
root_node = (RootDepsNode *)factory->create_node(NULL, "", "Root (Scene)");
}
return root_node;
@@ -272,7 +272,7 @@ TimeSourceDepsNode *Depsgraph::find_time_source(const ID *id) const
SubgraphDepsNode *Depsgraph::add_subgraph_node(const ID *id)
{
- DepsNodeFactory *factory = DEG_get_node_factory(DEPSNODE_TYPE_SUBGRAPH);
+ DepsNodeFactory *factory = deg_get_node_factory(DEPSNODE_TYPE_SUBGRAPH);
SubgraphDepsNode *subgraph_node =
(SubgraphDepsNode *)factory->create_node(id, "", id->name + 2);
@@ -316,7 +316,7 @@ IDDepsNode *Depsgraph::add_id_node(ID *id, const string &name)
{
IDDepsNode *id_node = find_id_node(id);
if (!id_node) {
- DepsNodeFactory *factory = DEG_get_node_factory(DEPSNODE_TYPE_ID_REF);
+ DepsNodeFactory *factory = deg_get_node_factory(DEPSNODE_TYPE_ID_REF);
id_node = (IDDepsNode *)factory->create_node(id, "", name);
id->tag |= LIB_TAG_DOIT;
/* register */
diff --git a/source/blender/depsgraph/intern/depsgraph_intern.h b/source/blender/depsgraph/intern/depsgraph_intern.h
index a87dc09..8279568 100644
--- a/source/blender/depsgraph/intern/depsgraph_intern.h
+++ b/source/blender/depsgraph/intern/depsgraph_intern.h
@@ -93,13 +93,13 @@ struct DepsNodeFactoryImpl : public DepsNodeFactory {
/* Typeinfo Management -------------------------------------------------- */
/* Register typeinfo */
-void DEG_register_node_typeinfo(DepsNodeFactory *factory);
+void deg_register_node_typeinfo(DepsNodeFactory *factory);
/* Get typeinfo for specified type */
-DepsNodeFactory *DEG_get_node_factory(const eDepsNode_Type type);
+DepsNodeFactory *deg_get_node_factory(const eDepsNode_Type type);
/* Get typeinfo for provided node */
-DepsNodeFactory *DEG_node_get_factory(const DepsNode *node);
+DepsNodeFactory *deg_node_get_factory(const DepsNode *node);
/* Editors Integration -------------------------------------------------- */
diff --git a/source/blender/depsgraph/intern/depsgraph_type_defines.cc b/source/blender/depsgraph/intern/depsgraph_type_defines.cc
index 903cd6f..76a6857 100644
--- a/source/blender/depsgraph/intern/depsgraph_type_defines.cc
+++ b/source/blender/depsgraph/intern/depsgraph_type_defines.cc
@@ -64,7 +64,7 @@ static GHash *_depsnode_typeinfo_registry = NULL;
/* Registration ------------------------------------------- */
/* Register node type */
-void DEG_register_node_typeinfo(DepsNodeFactory *factory)
+void deg_register_node_typeinfo(DepsNodeFactory *factory)
{
BLI_assert(factory != NULL);
BLI_ghash_insert(_depsnode_typeinfo_registry, SET_INT_IN_POINTER(factory->type()), factory);
@@ -73,19 +73,19 @@ void DEG_register_node_typeinfo(DepsNodeFactory *factory)
/* Getters ------------------------------------------------- */
/* Get typeinfo for specified type */
-DepsNodeFactory *DEG_get_node_factory(const eDepsNode_Type type)
+DepsNodeFactory *deg_get_node_factory(const eDepsNode_Type type)
{
/* look up type - at worst, it doesn't exist in table yet, and we fail */
return (DepsNodeFactory *)BLI_ghash_lookup(_depsnode_typeinfo_registry, SET_INT_IN_POINTER(type));
}
/* Get typeinfo for provided node */
-DepsNodeFactory *DEG_node_get_factory(const DepsNode *node)
+DepsNodeFactory *deg_node_get_factory(const DepsNode *node)
{
- if (!node)
+ if (node != NULL) {
return NULL;
-
- return DEG_get_node_factory(node->type);
+ }
+ return deg_get_node_factory(node->type);
}
/* Stringified opcodes ------------------------------------- */
@@ -159,9 +159,9 @@ void DEG_register_node_types(void)
DEG::_depsnode_typeinfo_registry = BLI_ghash_int_new("Depsgraph Node Type Registry");
/* register node types */
- DEG::DEG_register_base_depsnodes();
- DEG::DEG_register_component_depsnodes();
- DEG::DEG_register_operation_depsnodes();
+ DEG::deg_register_base_depsnodes();
+ DEG::deg_register_component_depsnodes();
+ DEG::deg_register_operation_depsnodes();
}
/* Free registry on exit */
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_debug.cc b/source/blender/depsgraph/intern/eval/deg_eval_debug.cc
index eb6888a..7800734 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_debug.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_debug.cc
@@ -54,7 +54,7 @@ DepsgraphStats *DepsgraphDebug::stats = NULL;
static string get_component_name(eDepsNode_Type type, const string &name = "")
{
- DepsNodeFactory *factory = DEG_get_node_factory(type);
+ DepsNodeFactory *factory = deg_get_node_factory(type);
if (name.empty()) {
return string(factory->tname());
}
diff --git a/source/blender/depsgraph/intern/nodes/deg_node.cc b/source/blender/depsgraph/intern/nodes/deg_node.cc
index cddde1d..6e17903 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node.cc
@@ -123,7 +123,7 @@ RootDepsNode::~RootDepsNode()
TimeSourceDepsNode *RootDepsNode::add_time_source(const string &name)
{
if (!time_source) {
- DepsNodeFactory *factory = DEG_get_node_factory(DEPSNODE_TYPE_TIMESOURCE);
+ DepsNodeFactory *factory = deg_get_node_factory(DEPSNODE_TYPE_TIMESOURCE);
time_source = (TimeSourceDepsNode *)factory->create_node(NULL, "", name);
/*time_source->owner = this;*/ // XXX
}
@@ -175,7 +175,7 @@ ComponentDepsNode *IDDepsNode::add_component(eDepsNode_Type type,
ComponentIDKey key(type, name);
ComponentDepsNode *comp_node = find_component(type, name);
if (!comp_node) {
- DepsNodeFactory *factory = DEG_get_node_factory(type);
+ DepsNodeFactory *factory = deg_get_node_factory(type);
comp_node = (ComponentDepsNode *)factory->create_node(this->id, "", name);
/* Register. */
@@ -263,13 +263,13 @@ SubgraphDepsNode::~SubgraphDepsNode()
DEG_DEPSNODE_DEFINE(SubgraphDepsNode, DEPSNODE_TYPE_SUBGRAPH, "Subgraph Node");
static DepsNodeFactoryImpl<SubgraphDepsNode> DNTI_SUBGRAPH;
-void DEG_register_base_depsnodes()
+void deg_register_base_depsnodes()
{
- DEG_register_node_typeinfo(&DNTI_ROOT);
- DEG_register_node_typeinfo(&DNTI_TIMESOURCE);
+ deg_register_node_typeinfo(&DNTI_ROOT);
+ deg_register_node_typeinfo(&DNTI_TIMESOURCE);
- DEG_register_node_typeinfo(&DNTI_ID_REF);
- DEG_register_node_typeinfo(&DNTI_SUBGRAPH);
+ deg_register_node_typeinfo(&DNTI_ID_REF);
+ deg_register_node_typeinfo(&DNTI_SUBGRAPH);
}
} // namespace DEG
diff --git a/source/blender/depsgraph/intern/nodes/deg_node.h b/source/blender/depsgraph/intern/nodes/deg_node.h
index c27d461..cf16f29 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node.h
@@ -239,6 +239,6 @@ typedef enum eSubgraphRef_Flag {
SUBGRAPH_FLAG_FIRSTREF = (1 << 1),
} eSubgraphRef_Flag;
-void DEG_register_base_depsnodes();
+void deg_register_base_depsnodes();
} // namespace DEG
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.cc b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
index 784b79b..8b65489 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
@@ -123,7 +123,7 @@ OperationDepsNode *ComponentDepsNode::add_operation(eDepsOperation_Type optype,
{
OperationDepsNode *op_node = has_operation(opcode, name);
if (!op_node) {
- DepsNodeFactory *factory = DEG_get_node_factory(DEPSNODE_TYPE_OPERATION);
+ DepsNodeFactory *factory = deg_get_node_factory(DEPSNODE_TYPE_OPERATION);
op_node = (OperationDepsNode *)factory->create_node(this->owner->id, "", name);
/* register opnode in this component's operation set */
@@ -278,20 +278,20 @@ static DepsNodeFactoryImpl<ShadingComponentDepsNode> DNTI_SHADING;
/* Node Types Register =================================== */
-void DEG_register_component_depsnodes()
+void deg_register_component_depsnodes()
{
- DEG_register_node_typeinfo(&DNTI_PARAMETERS);
- DEG_register_node_typeinfo(&DNTI_PROXY);
- DEG_register_node_typeinfo(&DNTI_ANIMATION);
- DEG_register_node_typeinfo(&DNTI_TRANSFORM);
- DEG_register_node_typeinfo(&DNTI_GEOMETRY);
- DEG_register_node_typeinfo(&DNTI_SEQUENCER);
-
- DEG_register_node_typeinfo(&DNTI_EVAL_POSE);
- DEG_register_node_typeinfo(&DNTI_BONE);
-
- DEG_register_node_typeinfo(&DNTI_EVAL_PARTICLES);
- DEG_register_node_typeinfo(&DNTI_SHADING);
+ deg_register_node_typeinfo(&DNTI_PARAMETERS);
+ deg_register_node_typeinfo(&DNTI_PROXY);
+ deg_register_node_typeinfo(&DNTI_ANIMATION);
+ deg_register_node_typeinfo(&DNTI_TRANSFORM);
+ deg_register_node_typeinfo(&DNTI_GEOMETRY);
+ deg_register_node_typeinfo(&DNTI_SEQUENCER);
+
+ deg_register_node_typeinfo(&DNTI_EVAL_POSE);
+ deg_register_node_typeinfo(&DNTI_BONE);
+
+ deg_register_node_typeinfo(&DNTI_EVAL_PARTICLES);
+ deg_register_node_typeinfo(&DNTI_SHADING);
}
} // namespace DEG
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.h b/source/blender/depsgraph/intern/nodes/deg_node_component.h
index d4c1ba9..9ea913c 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.h
@@ -207,6 +207,6 @@ struct ShadingComponentDepsNode : public ComponentDepsNode {
};
-void DEG_register_component_depsnodes();
+void deg_register_component_depsnodes();
} // namespace DEG
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_operation.cc b/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
index 0050b98..fda47f4 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
@@ -88,9 +88,9 @@ void OperationDepsNode::tag_update(Depsgraph *graph)
DEG_DEPSNODE_DEFINE(OperationDepsNode, DEPSNODE_TYPE_OPERATION, "Operation");
static DepsNodeFactoryImpl<Operat
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list