blender
/
blender
131
398
Fork 577
Code Issues 6.3k Pull Requests 738 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Sergey Sharybin 2017-12-06 12:27:44 +01:00
parent 7e344a9531 3ae6a8512d
commit 6c49b4154b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
View File

@ -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) {