Merged changes in the trunk up to revision 41638.

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index b6dbd9e3659..c5709ad3d9c 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -282,8 +282,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)
@@ -349,12 +350,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) {