Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 6 Dec 2017 11:27:44 +0000 (12:27 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 6 Dec 2017 11:27:44 +0000 (12:27 +0100)
source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc

index b947e3e01a007205b7c9fffa7415a4c2914f7080..531ea55cf5c854f6e67ed93e6afa928ea0d742e8 100644 (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) {