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

Fix T44980: Shapekeys with driver not working with new depsgraph in 2.75 test build

Browse Source 
Was just a few missing dependencies.
This commit is contained in:
Sergey Sharybin
2015-06-15 18:50:09 +02:00
parent 05b2ab1109
commit 473d46263b
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/depsgraph/intern/depsgraph_build_nodes.cc
View File

@@ -897,6 +897,9 @@ void DepsgraphNodeBuilder::build_proxy_rig(Object *ob)
void DepsgraphNodeBuilder::build_shapekeys(Key *key)
{
build_animdata(&key->id);
add_operation_node(&key->id, DEPSNODE_TYPE_GEOMETRY, DEPSOP_TYPE_EXEC, NULL,
DEG_OPCODE_PLACEHOLDER, "Shapekey Eval");
}
/* ObData Geometry Evaluation */

11
source/blender/depsgraph/intern/depsgraph_build_relations.cc
View File

@@ -425,6 +425,13 @@ void DepsgraphRelationBuilder::build_object(Main *bmain, Scene *scene, Object *o
build_camera(ob);
break;
}
Key *key =BKE_key_from_object(ob);
if (key != NULL) {
ComponentKey geometry_key((ID*)ob->data, DEPSNODE_TYPE_GEOMETRY);
ComponentKey key_key(&key->id, DEPSNODE_TYPE_GEOMETRY);
add_relation(key_key, geometry_key, DEPSREL_TYPE_GEOMETRY_EVAL, "Shapekeys");
}
}
/* particle systems */
@@ -811,6 +818,10 @@ void DepsgraphRelationBuilder::build_driver(ID *id, FCurve *fcu)
OperationKey local_transform_key(id, DEPSNODE_TYPE_TRANSFORM, DEG_OPCODE_TRANSFORM_LOCAL);
add_relation(driver_key, local_transform_key, DEPSREL_TYPE_OPERATION, "[Driver -> Transform]");
}
else if (GS(id->name) == ID_KE) {
ComponentKey geometry_key(id, DEPSNODE_TYPE_GEOMETRY);
add_relation(driver_key, geometry_key, DEPSREL_TYPE_GEOMETRY_EVAL, "[Driver -> Shapekey Geometry]");
}
}
/* ensure that affected prop's update callbacks will be triggered once done */