bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Depsgraph: Use more human readable relation keys identifier

Browse Source
This commit is contained in:
Sergey Sharybin 2018-11-15 11:32:45 +01:00
parent 48c137ad5d
commit 4a3a4eef14
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/blender/depsgraph/intern/builder/deg_builder_relations_keys.cc
View File

@ -72,10 +72,14 @@ ComponentKey::ComponentKey(ID *id, eDepsNode_Type type, const char *name)
string ComponentKey::identifier() const
{
const char *idname = (id) ? id->name : "<None>";
char typebuf[5];
BLI_snprintf(typebuf, sizeof(typebuf), "%d", type);
return string("ComponentKey(") +
idname + ", " + typebuf + ", '" + name + "')";
string result = string("ComponentKey(");
result += idname;
result += ", " + string(nodeTypeAsString(type));
if (name[0] != '\0') {
result += ", '" + string(name) + "'";
}
result += ')';
return result;
}
/////////////////////////////////////////
@ -174,13 +178,15 @@ OperationKey::OperationKey(ID *id,
string OperationKey::identifier() const
{
char typebuf[5];
BLI_snprintf(typebuf, sizeof(typebuf), "%d", component_type);
return string("OperationKey(") +
"t: " + typebuf +
", cn: '" + component_name +
"', c: " + operationCodeAsString(opcode) +
", n: '" + name + "')";
string result = string("OperationKey(");
result += "type: " + string(nodeTypeAsString(component_type));
result += ", component name: '" + string(component_name) + "'";
result += ", operation code: " + string(operationCodeAsString(opcode));
if (name[0] != '\0') {
result += ", '" + string(name) + "'";
}
result += ")";
return result;
}
/////////////////////////////////////////
@ -212,7 +218,7 @@ string RNAPathKey::identifier() const
const char *id_name = (id) ? id->name : "<No ID>";
const char *prop_name = (prop) ? RNA_property_identifier(prop) : "<No Prop>";
return string("RnaPathKey(") + "id: " + id_name +
", prop: " + prop_name + "')";
", prop: '" + prop_name + "')";
}
} // namespace DEG

1
source/blender/depsgraph/intern/depsgraph_types.h
View File

@ -166,7 +166,6 @@ typedef enum eDepsNode_Type {
/* Total number of meaningful node types. */
NUM_DEG_NODE_TYPES,
} eDepsNode_Type;
const char *nodeTypeAsString(eDepsNode_Type type);
/* Identifiers for common operations (as an enum). */