[Bf-blender-cvs] [d5e491c9a7a] master: Depsgraph: Cleanup, don't use bracers in relations names
Sergey Sharybin
noreply at git.blender.org
Mon Dec 4 14:49:29 CET 2017
Commit: d5e491c9a7a7c0468c024a3f1627f0b9c38004bc
Author: Sergey Sharybin
Date: Mon Dec 4 12:48:16 2017 +0100
Branches: master
https://developer.blender.org/rBd5e491c9a7a7c0468c024a3f1627f0b9c38004bc
Depsgraph: Cleanup, don't use bracers in relations names
Those don't bring any information.
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 293f63e9db2..064be03d7d4 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -451,7 +451,7 @@ void DepsgraphRelationBuilder::build_object(Object *object)
/* Local -> parent. */
add_relation(local_transform_key,
parent_transform_key,
- "[ObLocal -> ObParent]");
+ "ObLocal -> ObParent");
}
/* Modifiers. */
if (object->modifiers.first != NULL) {
@@ -477,8 +477,8 @@ void DepsgraphRelationBuilder::build_object(Object *object)
&object->constraints,
NULL);
/* operation order */
- add_relation(base_op_key, constraint_key, "[ObBase-> Constraint Stack]");
- add_relation(constraint_key, final_transform_key, "[ObConstraints -> Done]");
+ add_relation(base_op_key, constraint_key, "ObBase-> Constraint Stack");
+ add_relation(constraint_key, final_transform_key, "ObConstraints -> Done");
// XXX
add_relation(constraint_key, ob_ubereval_key, "Temp Ubereval");
add_relation(ob_ubereval_key, final_transform_key, "Temp Ubereval");
@@ -724,14 +724,14 @@ void DepsgraphRelationBuilder::build_constraints(ID *id,
* Constraint dependency chain.
*/
TimeSourceKey time_src_key;
- add_relation(time_src_key, constraint_op_key, "[TimeSrc -> Animation]");
+ add_relation(time_src_key, constraint_op_key, "TimeSrc -> Animation");
}
else if (cti->type == CONSTRAINT_TYPE_TRANSFORM_CACHE) {
/* TODO(kevin): This is more a TimeSource -> CacheFile -> Constraint
* dependency chain.
*/
TimeSourceKey time_src_key;
- add_relation(time_src_key, constraint_op_key, "[TimeSrc -> Animation]");
+ add_relation(time_src_key, constraint_op_key, "TimeSrc -> Animation");
bTransformCacheConstraint *data = (bTransformCacheConstraint *)con->data;
if (data->cache_file) {
ComponentKey cache_key(&data->cache_file->id, DEG_NODE_TYPE_CACHE);
@@ -896,7 +896,7 @@ void DepsgraphRelationBuilder::build_animdata(ID *id)
if (adt->action || adt->nla_tracks.first) {
/* wire up dependency to time source */
TimeSourceKey time_src_key;
- add_relation(time_src_key, adt_key, "[TimeSrc -> Animation]");
+ add_relation(time_src_key, adt_key, "TimeSrc -> Animation");
// XXX: Hook up specific update callbacks for special properties which may need it...
@@ -956,13 +956,13 @@ void DepsgraphRelationBuilder::build_animdata(ID *id)
DEG_OPCODE_DRIVER,
fcu->rna_path ? fcu->rna_path : "",
fcu->array_index);
- add_relation(prev_driver_key, driver_key, "[Driver Order]");
+ add_relation(prev_driver_key, driver_key, "Driver Order");
}
}
/* prevent driver from occurring before own animation... */
if (adt->action || adt->nla_tracks.first) {
- add_relation(adt_key, driver_key, "[AnimData Before Drivers]");
+ add_relation(adt_key, driver_key, "AnimData Before Drivers");
}
}
}
@@ -982,7 +982,7 @@ void DepsgraphRelationBuilder::build_driver(ID *id, FCurve *fcu)
/* Create dependency between driver and data affected by it. */
/* - direct property relationship... */
//RNAPathKey affected_key(id, fcu->rna_path);
- //add_relation(driver_key, affected_key, "[Driver -> Data] DepsRel");
+ //add_relation(driver_key, affected_key, "Driver -> Data");
/* Driver -> data components (for interleaved evaluation
* bones/constraints/modifiers).
@@ -1009,7 +1009,7 @@ void DepsgraphRelationBuilder::build_driver(ID *id, FCurve *fcu)
DEG_NODE_TYPE_BONE,
pchan->name,
DEG_OPCODE_BONE_LOCAL);
- add_relation(driver_key, bone_key, "[Driver -> Bone]");
+ add_relation(driver_key, bone_key, "Driver -> Bone");
}
else {
fprintf(stderr,
@@ -1043,7 +1043,7 @@ void DepsgraphRelationBuilder::build_driver(ID *id, FCurve *fcu)
DEG_OPCODE_BONE_LOCAL);
add_relation(driver_key,
bone_key,
- "[Arm Bone -> Driver -> Bone]");
+ "Arm Bone -> Driver -> Bone");
}
}
}
@@ -1062,7 +1062,7 @@ void DepsgraphRelationBuilder::build_driver(ID *id, FCurve *fcu)
DEG_NODE_TYPE_GEOMETRY,
DEG_OPCODE_GEOMETRY_UBEREVAL);
if (has_node(modifier_key)) {
- add_relation(driver_key, modifier_key, "[Driver -> Modifier]");
+ add_relation(driver_key, modifier_key, "Driver -> Modifier");
}
else {
printf("Unexisting driver RNA path: %s\n", rna_path);
@@ -1074,11 +1074,11 @@ void DepsgraphRelationBuilder::build_driver(ID *id, FCurve *fcu)
Key *shape_key = (Key *)id;
ComponentKey geometry_key(shape_key->from, DEG_NODE_TYPE_GEOMETRY);
- add_relation(driver_key, geometry_key, "[Driver -> ShapeKey Geom]");
+ add_relation(driver_key, geometry_key, "Driver -> ShapeKey Geom");
}
else if (strstr(rna_path, "key_blocks[")) {
ComponentKey geometry_key(id, DEG_NODE_TYPE_GEOMETRY);
- add_relation(driver_key, geometry_key, "[Driver -> ShapeKey Geom]");
+ add_relation(driver_key, geometry_key, "Driver -> ShapeKey Geom");
}
else {
if (GS(id->name) == ID_OB) {
@@ -1088,13 +1088,13 @@ void DepsgraphRelationBuilder::build_driver(ID *id, FCurve *fcu)
DEG_OPCODE_TRANSFORM_LOCAL);
add_relation(driver_key,
local_transform_key,
- "[Driver -> Transform]");
+ "Driver -> Transform");
}
else if (GS(id->name) == ID_KE) {
ComponentKey geometry_key(id, DEG_NODE_TYPE_GEOMETRY);
add_relation(driver_key,
geometry_key,
- "[Driver -> Shapekey Geometry]");
+ "Driver -> Shapekey Geometry");
}
}
/* Ensure that affected prop's update callbacks will be triggered once
@@ -1138,7 +1138,7 @@ void DepsgraphRelationBuilder::build_driver(ID *id, FCurve *fcu)
DEG_OPCODE_BONE_DONE);
add_relation(target_key,
driver_key,
- "[Bone Target -> Driver]");
+ "Bone Target -> Driver");
}
}
else if (dtar->flag & DTAR_FLAG_STRUCT_REF) {
@@ -1153,7 +1153,7 @@ void DepsgraphRelationBuilder::build_driver(ID *id, FCurve *fcu)
OperationKey target_key(dtar->id,
DEG_NODE_TYPE_TRANSFORM,
DEG_OPCODE_TRANSFORM_FINAL);
- add_relation(target_key, driver_key, "[Target -> Driver]");
+ add_relation(target_key, driver_key, "Target -> Driver");
}
else if (dtar->rna_path && strstr(dtar->rna_path, "pose.bones[")) {
/* Workaround for ensuring that local bone transforms don't end
@@ -1179,7 +1179,7 @@ void DepsgraphRelationBuilder::build_driver(ID *id, FCurve *fcu)
DEG_NODE_TYPE_BONE,
target_pchan->name,
DEG_OPCODE_BONE_LOCAL);
- add_relation(bone_key, driver_key, "[RNA Bone -> Driver]");
+ add_relation(bone_key, driver_key, "RNA Bone -> Driver");
}
}
else {
@@ -1193,7 +1193,7 @@ void DepsgraphRelationBuilder::build_driver(ID *id, FCurve *fcu)
/* Resolve path to get node. */
RNAPathKey target_key(dtar->id,
dtar->rna_path ? dtar->rna_path : "");
- add_relation(target_key, driver_key, "[RNA Target -> Driver]");
+ add_relation(target_key, driver_key, "RNA Target -> Driver");
}
}
DRIVER_TARGETS_LOOPER_END
@@ -1206,7 +1206,7 @@ void DepsgraphRelationBuilder::build_driver(ID *id, FCurve *fcu)
python_driver_depends_on_time(driver))
{
TimeSourceKey time_src_key;
- add_relation(time_src_key, driver_key, "[TimeSrc -> Driver]");
+ add_relation(time_src_key, driver_key, "TimeSrc -> Driver");
}
}
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
index cdc98ad6b6a..ff805240799 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
@@ -258,7 +258,7 @@ void DepsgraphRelationBuilder::build_splineik_pose(Object *object,
// TODO: the bigggest point here is that we need the curve PATH and not just the general geometry...
ComponentKey target_key(&data->tar->id, DEG_NODE_TYPE_GEOMETRY);
ComponentKey pose_key(&object->id, DEG_NODE_TYPE_EVAL_POSE);
- add_relation(target_key, pose_key, "[Curve.Path -> Spline IK] DepsRel");
+ add_relation(target_key, pose_key, "Curve.Path -> Spline IK");
}
pchan->flag |= POSE_DONE;
@@ -414,7 +414,7 @@ void DepsgraphRelationBuilder::build_rig(Object *object)
}
OperationKey parent_key(&object->id, DEG_NODE_TYPE_BONE, pchan->parent->name, parent_key_opcode);
- add_relation(parent_key, bone_pose_key, "[Parent Bone -> Child Bone]");
+ add_relation(parent_key, bone_pose_key, "Parent Bone -> Child Bone");
}
/* constraints */
More information about the Bf-blender-cvs
mailing list