Commit: fe14fa34260b3d434f31e511e723062d7a5f893c
Author: Joshua Leung
Date: Fri Dec 12 15:27:49 2014 +1300
Branches: depsgraph_refactor
https://developer.blender.org/rBfe14fa34260b3d434f31e511e723062d7a5f893c
Typo fixes, and extra comments/debug logging for tracking down armature
building bugs
===================================================================
M source/blender/depsgraph/intern/depsgraph_build_relations.cpp
M source/blender/depsgraph/intern/depsnode_operation.cpp
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
index 650a3cf..5c7f2ae 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
@@ -968,11 +968,15 @@ void DepsgraphRelationBuilder::build_rig(Scene *scene,
Object *ob)
for (bPoseChannel *pchan = (bPoseChannel *)ob->pose->chanbase.first;
pchan; pchan = pchan->next) {
ComponentKey bone_key(&ob->id, DEPSNODE_TYPE_BONE, pchan->name);
pchan->flag &= ~POSE_DONE;
+
/* bone parent */
if (pchan->parent == NULL) {
/* link bone/component to pose "sources" if it doesn't
have any obvious dependencies */
add_relation(init_key, bone_key,
DEPSREL_TYPE_OPERATION, "PoseEval Source-Bone Link");
}
+ else {
+ /* link bone/component to parent bone (see next loop) */
+ }
/* constraints */
if (pchan->constraints.first != NULL) {
@@ -1027,10 +1031,12 @@ void DepsgraphRelationBuilder::build_rig(Scene *scene,
Object *ob)
pchan->parent->name);
}
if (has_common_root) {
+ fprintf(stderr, "common root: %s (par = %s)\n",
pchan->name, pchan->parent->name);
OperationKey parent_transforms_key =
bone_transforms_key(ob, pchan->parent);
add_relation(parent_transforms_key, bone_key,
DEPSREL_TYPE_TRANSFORM, "[Parent Bone -> Child Bone]");
}
else {
+ fprintf(stderr, "not common root: %s (par =
%s)\n", pchan->name, pchan->parent->name);
ComponentKey parent_key(&ob->id,
DEPSNODE_TYPE_BONE, pchan->parent->name);
add_relation(parent_key, bone_key,
DEPSREL_TYPE_TRANSFORM, "[Parent Bone -> Child Bone]");
}
diff --git a/source/blender/depsgraph/intern/depsnode_operation.cpp
b/source/blender/depsgraph/intern/depsnode_operation.cpp
index f8e8048..8df9abc 100644
--- a/source/blender/depsgraph/intern/depsnode_operation.cpp
+++ b/source/blender/depsgraph/intern/depsnode_operation.cpp
@@ -64,7 +64,7 @@ OperationDepsNode::~OperationDepsNode()
void OperationDepsNode::tag_update(Depsgraph *graph)
{
- /* tag for update, but also not that this was the source of an update */
+ /* tag for update, but also note that this was the source of an update
*/
flag |= (DEPSOP_FLAG_NEEDS_UPDATE | DEPSOP_FLAG_DIRECTLY_MODIFIED);
graph->add_entry_tag(this);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
