diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-22 13:20:28 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-22 13:20:28 +0300 |
| commit | a17de773fd86320c33668cd6d22e9d31954d2b34 (patch) | |
| tree | 91bd7e385aa59ad4e3d18452da29716acb91ded7 /source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc | |
| parent | 6bac7c35e8bbed490d5db1af7758516eca0e919c (diff) | |
| parent | 93072e44d11efe9528d2bb7a3a62784331bf0a08 (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, 1 insertions, 3 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 c3116db6146..0892a48caaf 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc @@ -135,7 +135,6 @@ void DepsgraphNodeBuilder::build_splineik_pose(Object *object, void DepsgraphNodeBuilder::build_rig(Object *object) { bArmature *armature = (bArmature *)object->data; - const short armature_tag = armature->id.tag; Scene *scene_cow; Object *object_cow; bArmature *armature_cow; @@ -163,9 +162,8 @@ void DepsgraphNodeBuilder::build_rig(Object *object) * mechanism in-between here to ensure that we can use same rig * multiple times in same scene. */ - if ((armature_tag & LIB_TAG_DOIT) == 0) { + if (built_map_.checkIsBuilt(armature)) { build_animdata(&armature->id); - /* Make sure pose is up-to-date with armature updates. */ add_operation_node(&armature->id, DEG_NODE_TYPE_PARAMETERS, |