Merged changes in the trunk up to revision 42425.

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c

1 files changed, 17 insertions, 9 deletions

diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index c5709ad3d9c..8ebac31ad95 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -114,23 +114,28 @@ void unlink_group(Group *group)
 	}
 	
 	for(ob= bmain->object.first; ob; ob= ob->id.next) {
-		bActionStrip *strip;
 		
 		if(ob->dup_group==group) {
 			ob->dup_group= NULL;
-		
-			/* duplicator strips use a group object, we remove it */
-			for(strip= ob->nlastrips.first; strip; strip= strip->next) {
-				if(strip->object)
-					strip->object= NULL;
+#if 0		/* XXX OLD ANIMSYS, NLASTRIPS ARE NO LONGER USED */
+			{
+				bActionStrip *strip;
+				/* duplicator strips use a group object, we remove it */
+				for(strip= ob->nlastrips.first; strip; strip= strip->next) {
+					if(strip->object)
+						strip->object= NULL;
+				}
 			}
+#endif
 		}
 		
 		for(psys=ob->particlesystem.first; psys; psys=psys->next){
 			if(psys->part->dup_group==group)
 				psys->part->dup_group= NULL;
+#if 0		/* not used anymore, only keps for readfile.c, no need to account for this */
 			if(psys->part->eff_group==group)
 				psys->part->eff_group= NULL;
+#endif
 		}
 	}
 	
@@ -279,13 +284,14 @@ void group_tag_recalc(Group *group)
 	}
 }
 
-int group_is_animated(Object *parent, Group *group)
+int group_is_animated(Object *UNUSED(parent), Group *group)
 {
 	GroupObject *go;
-	
-	// XXX: old animsys depreceated...
+
+#if 0 /* XXX OLD ANIMSYS, NLASTRIPS ARE NO LONGER USED */
 	if(parent->nlastrips.first)
 		return 1;
+#endif
 
 	for(go= group->gobject.first; go; go= go->next)
 		if(go->ob && go->ob->proxy)
@@ -387,6 +393,7 @@ void group_handle_recalc_and_update(Scene *scene, Object *UNUSED(parent), Group
 	}
 }
 
+#if 0
 Object *group_get_member_with_action(Group *group, bAction *act)
 {
 	GroupObject *go;
@@ -438,3 +445,4 @@ void group_relink_nla_objects(Object *ob)
 	}
 }
 
+#endif