diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-01-13 13:14:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-13 13:14:03 +0300 |
| commit | d2e6ea65c3f2e2c721d1c0c5fc19b842f9d4de05 (patch) | |
| tree | 45e5390c6ae43e515e4a12b3beb8bff79d482290 /source/blender/blenkernel/intern/group.c | |
| parent | 9024b6789eb368c0cb4dc05e6659ddca9f362fbd (diff) | |
revert r34284, this fix was incorrect.
Diffstat (limited to 'source/blender/blenkernel/intern/group.c')
| -rw-r--r-- | source/blender/blenkernel/intern/group.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c index 3b8daced657..e48ec8ac288 100644 --- a/source/blender/blenkernel/intern/group.c +++ b/source/blender/blenkernel/intern/group.c @@ -364,22 +364,17 @@ void group_handle_recalc_and_update(Scene *scene, Object *UNUSED(parent), Group scene->r.cfra= cfrao; } else -#else +#endif { - /* use 2 loops to avoid updating objects multiple times */ - for(go= group->gobject.first; go; go= go->next) { - if(go->ob && go->recalc) { - go->ob->recalc |= go->recalc; - } - } - + /* only do existing tags, as set by regular depsgraph */ for(go= group->gobject.first; go; go= go->next) { - if(go->ob && go->recalc) { - object_handle_update(scene, go->ob); + if(go->ob) { + if(go->ob->recalc) { + object_handle_update(scene, go->ob); + } } } } -#endif } Object *group_get_member_with_action(Group *group, bAction *act) |