Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2011-11-06 09:46:45 +0400
committerJoshua Leung <aligorith@gmail.com>2011-11-06 09:46:45 +0400
commit440c1c2c1745b6d4acd13f405643100cb913fb3b (patch)
tree79a6621f6a76b887b3aa78645758d214b5654a04 /source/blender/blenkernel/intern/group.c
parent4c17f8e5de94f3abc65995e7a2964bb9e6ea7642 (diff)
As discussed on the mailing list, removing the non-functional,
incompatible, and unmaintainable Time Offset cruft. - Slow Parenting lives another day (just), although it now carries appropriate cautionary disclaimers. It's only really for the Game Engine nowadays, as that's the only place where it can possibly work with any reliability. - "Animation Hacks" panel is now "Relations Extras". I could've merged the two panels, though I figured these options weren't that frequently used to justify taking up screen-space by default along with the panel
Diffstat (limited to 'source/blender/blenkernel/intern/group.c')
-rw-r--r--source/blender/blenkernel/intern/group.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index cd025ecb559..76c3e6e5502 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -276,8 +276,9 @@ void group_tag_recalc(Group *group)
int group_is_animated(Object *parent, Group *group)
{
GroupObject *go;
-
- if(give_timeoffset(parent) != 0.0f || parent->nlastrips.first)
+
+ // XXX: old animsys depreceated...
+ if(parent->nlastrips.first)
return 1;
for(go= group->gobject.first; go; go= go->next)
@@ -343,12 +344,11 @@ void group_handle_recalc_and_update(Scene *scene, Object *UNUSED(parent), Group
* but when its enabled at some point it will need to be changed so as not to update so much - campbell */
/* if animated group... */
- if(give_timeoffset(parent) != 0.0f || parent->nlastrips.first) {
+ if(parent->nlastrips.first) {
int cfrao;
/* switch to local time */
cfrao= scene->r.cfra;
- scene->r.cfra -= (int)floor(give_timeoffset(parent) + 0.5f);
/* we need a DAG per group... */
for(go= group->gobject.first; go; go= go->next) {