diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-29 18:00:50 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-29 18:01:07 +0300 |
commit | aa2ecbf35b26edd22deb1595487ef59035d1a16c (patch) | |
tree | 2db40fef00cf54c32f98ed1e12fc66432ae198f2 | |
parent | aad711d06428545c415b277fb6cf899a1cf1c03a (diff) | |
parent | 1f9387ef917b4e8977a0eef56af272223e50fb63 (diff) |
Merge branch 'master' into blender2.8
-rw-r--r-- | source/blender/blenkernel/BKE_group.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/group.c | 12 |
2 files changed, 0 insertions, 13 deletions
diff --git a/source/blender/blenkernel/BKE_group.h b/source/blender/blenkernel/BKE_group.h index 9aab6950496..1d35e6ab9fc 100644 --- a/source/blender/blenkernel/BKE_group.h +++ b/source/blender/blenkernel/BKE_group.h @@ -52,7 +52,6 @@ bool BKE_group_object_exists(struct Group *group, struct Object *ob); bool BKE_group_object_cyclic_check(struct Main *bmain, struct Object *object, struct Group *group); bool BKE_group_is_animated(struct Group *group, struct Object *parent); -void BKE_group_tag_recalc(struct Group *group); void BKE_group_handle_recalc_and_update(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *parent, struct Group *group); #endif /* __BKE_GROUP_H__ */ diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c index 5e5f8114ead..0fd6685242f 100644 --- a/source/blender/blenkernel/intern/group.c +++ b/source/blender/blenkernel/intern/group.c @@ -253,18 +253,6 @@ Group *BKE_group_object_find(Group *group, Object *ob) return NULL; } -void BKE_group_tag_recalc(Group *group) -{ - GroupObject *go; - - if (group == NULL) return; - - for (go = group->gobject.first; go; go = go->next) { - if (go->ob) - go->ob->recalc = go->recalc; - } -} - bool BKE_group_is_animated(Group *group, Object *UNUSED(parent)) { GroupObject *go; |