archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Depsgraph: Cleanup, make naming more understandable

Browse Source
This commit is contained in:
Sergey Sharybin
2017-12-15 17:46:30 +01:00
parent 3d72b94196
commit da570fcbb4
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
View File

@@ -177,7 +177,7 @@ static void deg_debug_graphviz_legend(const DebugContext &ctx)
#ifdef COLOR_SCHEME_NODE_TYPE
const int (*pair)[2];
for (pair = deg_debug_node_type_color_map; (*pair)[0] >= 0; ++pair) {
DepsNodeFactory *nti = DEG_get_node_factory((eDepsNode_Type)(*pair)[0]);
DepsNodeFactory *nti = deg_type_get_factory((eDepsNode_Type)(*pair)[0]);
deg_debug_graphviz_legend_color(ctx,
nti->tname().c_str(),
deg_debug_colors_light[(*pair)[1] % deg_debug_max_colors]);

4
source/blender/depsgraph/intern/depsgraph.cc
View File

@@ -257,7 +257,7 @@ static void id_node_deleter(void *value)
TimeSourceDepsNode *Depsgraph::add_time_source()
{
if (time_source == NULL) {
DepsNodeFactory *factory = deg_get_node_factory(DEG_NODE_TYPE_TIMESOURCE);
DepsNodeFactory *factory = deg_type_get_factory(DEG_NODE_TYPE_TIMESOURCE);
time_source = (TimeSourceDepsNode *)factory->create_node(NULL, "", "Time Source");
}
return time_source;
@@ -277,7 +277,7 @@ IDDepsNode *Depsgraph::add_id_node(ID *id, const char *name)
{
IDDepsNode *id_node = find_id_node(id);
if (!id_node) {
DepsNodeFactory *factory = deg_get_node_factory(DEG_NODE_TYPE_ID_REF);
DepsNodeFactory *factory = deg_type_get_factory(DEG_NODE_TYPE_ID_REF);
id_node = (IDDepsNode *)factory->create_node(id, "", name);
id->tag |= LIB_TAG_DOIT;
/* register */

2
source/blender/depsgraph/intern/depsgraph_intern.h
View File

@@ -102,7 +102,7 @@ struct DepsNodeFactoryImpl : public DepsNodeFactory {
void deg_register_node_typeinfo(DepsNodeFactory *factory);
/* Get typeinfo for specified type */
DepsNodeFactory *deg_get_node_factory(const eDepsNode_Type type);
DepsNodeFactory *deg_type_get_factory(const eDepsNode_Type type);
/* Get typeinfo for provided node */
DepsNodeFactory *deg_node_get_factory(const DepsNode *node);

4
source/blender/depsgraph/intern/depsgraph_type_defines.cc
View File

@@ -65,7 +65,7 @@ void deg_register_node_typeinfo(DepsNodeFactory *factory)
/* Getters ------------------------------------------------- */
/* Get typeinfo for specified type */
DepsNodeFactory *deg_get_node_factory(const eDepsNode_Type type)
DepsNodeFactory *deg_type_get_factory(const eDepsNode_Type type)
{
/* look up type - at worst, it doesn't exist in table yet, and we fail */
return depsnode_typeinfo_registry[type];
@@ -77,7 +77,7 @@ DepsNodeFactory *deg_node_get_factory(const DepsNode *node)
if (node != NULL) {
return NULL;
}
return deg_get_node_factory(node->type);
return deg_type_get_factory(node->type);
}
/* Stringified opcodes ------------------------------------- */

2
source/blender/depsgraph/intern/nodes/deg_node.cc
View File

@@ -202,7 +202,7 @@ ComponentDepsNode *IDDepsNode::add_component(eDepsNode_Type type,
{
ComponentDepsNode *comp_node = find_component(type, name);
if (!comp_node) {
DepsNodeFactory *factory = deg_get_node_factory(type);
DepsNodeFactory *factory = deg_type_get_factory(type);
comp_node = (ComponentDepsNode *)factory->create_node(this->id, "", name);
/* Register. */

2
source/blender/depsgraph/intern/nodes/deg_node_component.cc
View File

@@ -231,7 +231,7 @@ OperationDepsNode *ComponentDepsNode::add_operation(const DepsEvalOperationCb& o
{
OperationDepsNode *op_node = find_operation(opcode, name, name_tag);
if (!op_node) {
DepsNodeFactory *factory = deg_get_node_factory(DEG_NODE_TYPE_OPERATION);
DepsNodeFactory *factory = deg_type_get_factory(DEG_NODE_TYPE_OPERATION);
op_node = (OperationDepsNode *)factory->create_node(this->owner->id, "", name);
/* register opnode in this component's operation set */