diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-06 14:27:44 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-06 14:27:44 +0300 |
| commit | 6c49b4154b16aa7a3b867c561cc233ce5cdb9cb4 (patch) | |
| tree | 833cd41dd0604e49941cb8f6048880bc34eb6834 /source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc | |
| parent | 7e344a9531608f18a9ec3a607e3b5e8b37d6864d (diff) | |
| parent | 3ae6a8512daf5007c255949b2221732e40e7ddf8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc index b947e3e01a0..531ea55cf5c 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc @@ -319,7 +319,7 @@ void DepsgraphNodeBuilder::build_rig(Object *object) void DepsgraphNodeBuilder::build_proxy_rig(Object *object) { - ID *obdata = (ID *)object->data; + bArmature *arm = (bArmature *)object->data; OperationDepsNode *op_node; Object *object_cow; if (DEG_depsgraph_use_copy_on_write()) { @@ -334,7 +334,7 @@ void DepsgraphNodeBuilder::build_proxy_rig(Object *object) /* Sanity check. */ BLI_assert(object->pose != NULL); /* Animation. */ - build_animdata(obdata); + build_animdata(&arm->id); /* speed optimization for animation lookups */ BKE_pose_channels_hash_make(object->pose); if (object_cow->pose->flag & POSE_CONSTRAINTS_NEED_UPDATE_FLAGS) { |