Merge branch 'master' into blender2.8
[blender.git] / source / blender / depsgraph / intern / builder / deg_builder_relations.cc
index 45e05c6f928417e716b7eaf5971385178d6dca39..4dfcf5229e3a2f33f2204a3e1e6299f4cfe6b6c3 100644 (file)
@@ -539,7 +539,9 @@ void DepsgraphRelationBuilder::build_object_data(Object *object)
        }
        ID *obdata_id = (ID *)object->data;
        /* Object data animation. */
-       build_animdata(obdata_id);
+       if (!built_map_.checkIsBuilt(obdata_id)) {
+               build_animdata(obdata_id);
+       }
        /* type-specific data. */
        switch (object->type) {
                case OB_MESH:
@@ -557,7 +559,7 @@ void DepsgraphRelationBuilder::build_object_data(Object *object)
                                build_proxy_rig(object);
                        }
                        else {
-                               build_rig(object);
+                                build_rig(object);
                        }
                        break;
                case OB_LAMP: