Next level of Proxy support for animation: Proxy for duplicated groups.

Notes:
- Only referenced groups (from other files)
- Only 1 group (no more duplicates using same group yet)
- Only Proxy working well for Armature or Empty

Is going to be reviewed in Plumiferos team; but target is that this will
solve a major animation pipeline bottleneck :)

Usage; select group, alt+ctrl+p, pick an object you want to proxify.

2 files changed, 70 insertions, 16 deletions

diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index 5d578f47297..63dadb6e6c1 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -1245,24 +1245,71 @@ void make_vertex_parent(void)
 	/* BIF_undo_push(str); not, conflicts with editmode undo... */
 }
 
+static Object *group_objects_menu(Group *group)
+{
+	GroupObject *go;
+	int len= 0;
+	short a, nr;
+	char *str;
+		
+	for(go= group->gobject.first; go; go= go->next) {
+		if(go->ob)
+			len++;
+	}
+	if(len==0) return NULL;
+	
+	str= MEM_callocN(40+32*len, "menu");
+	
+	strcpy(str, "Select a Group Object %t");
+	a= strlen(str);
+	for(nr=1, go= group->gobject.first; go; go= go->next, nr++) {
+		a+= sprintf(str+a, "|%s %%x%d", go->ob->id.name+2, nr);
+	}
+	
+	a= pupmenu_col(str, 20);
+	MEM_freeN(str);
+	if(a>0) {
+		go= BLI_findlink(&group->gobject, a-1);
+		return go->ob;
+	}
+	return NULL;
+}
+
+
 /* adds empty object to become local replacement data of a library-linked object */
 void make_proxy(void)
 {
 	Object *ob= OBACT;
+	Object *gob= NULL;
 	
 	if(G.scene->id.lib) return;
 	if(ob==NULL) return;
 	
-	if(ob->id.lib==NULL) {
-		error("Can not make proxy for non-linked object");
+	
+	if(ob->dup_group && ob->dup_group->id.lib) {
+		gob= ob;
+		/* gives menu with list of objects in group */
+		ob= group_objects_menu(ob->dup_group);
 	}
-	else if(okee("Make Proxy Object")) {
+	else if(ob->id.lib) {
+		if(okee("Make Proxy Object")==0)
+		return;
+	}
+	else {
+		error("Can only make proxy for a referenced object or group");
+		return;
+	}
+	
+	if(ob) {
 		Object *newob;
 		Base *newbase, *oldbase= BASACT;
 		char name[32];
 		
 		newob= add_object(OB_EMPTY);
-		strcpy(name, ob->id.name+2);
+		if(gob)
+			strcpy(name, gob->id.name+2);
+		else
+			strcpy(name, ob->id.name+2);
 		strcat(name, "_proxy");
 		rename_id(&newob->id, name);
 		
@@ -1272,12 +1319,14 @@ void make_proxy(void)
 		newob->lay= newbase->lay;
 		
 		/* remove base, leave user count of object, it gets linked in object_make_proxy */
-		BLI_remlink(&G.scene->base, oldbase);
-		MEM_freeN(oldbase);
-		
-		object_make_proxy(newob, ob);
+		if(gob==NULL) {
+			BLI_remlink(&G.scene->base, oldbase);
+			MEM_freeN(oldbase);
+		}		
+		object_make_proxy(newob, ob, gob);
 		
 		DAG_scene_sort(G.scene);
+		DAG_object_flush_update(G.scene, newob, OB_RECALC);
 		allqueue(REDRAWALL, 0);
 		BIF_undo_push("Make Proxy Object");
 	}
@@ -4718,19 +4767,21 @@ void adduplicate(int mode, int dupflag)
 	base= FIRSTBASE;
 	while(base) {
 		if TESTBASELIB(base) {
-			relink_constraints(&base->object->constraints);
-			if (base->object->pose){
+			ob= base->object;
+			relink_constraints(&ob->constraints);
+			if (ob->pose){
 				bPoseChannel *chan;
-				for (chan = base->object->pose->chanbase.first; chan; chan=chan->next){
+				for (chan = ob->pose->chanbase.first; chan; chan=chan->next){
 					relink_constraints(&chan->constraints);
 				}
 			}
-			modifiers_foreachIDLink(base->object,
-			                        adduplicate__forwardModifierLinks, NULL);
-			ID_NEW(base->object->parent);
-			ID_NEW(base->object->track);
+			modifiers_foreachIDLink(ob, adduplicate__forwardModifierLinks, NULL);
+			ID_NEW(ob->parent);
+			ID_NEW(ob->track);
+			ID_NEW(ob->proxy);
+			ID_NEW(ob->proxy_group);
 			
-			for(strip= base->object->nlastrips.first; strip; strip= strip->next) {
+			for(strip= ob->nlastrips.first; strip; strip= strip->next) {
 				bActionModifier *amod;
 				for(amod= strip->modifiers.first; amod; amod= amod->next)
 					ID_NEW(amod->ob);
diff --git a/source/blender/src/transform_generics.c b/source/blender/src/transform_generics.c
index f9e75d2336a..1435cbff47e 100755
--- a/source/blender/src/transform_generics.c
+++ b/source/blender/src/transform_generics.c
@@ -72,6 +72,7 @@
 #include "BKE_displist.h"
 #include "BKE_depsgraph.h"
 #include "BKE_global.h"
+#include "BKE_group.h"
 #include "BKE_ipo.h"
 #include "BKE_lattice.h"
 #include "BKE_mesh.h"
@@ -355,6 +356,8 @@ void recalcData(TransInfo *t)
 			/* proxy exception */
 			if(ob->proxy)
 				ob->proxy->recalc |= ob->recalc;
+			if(ob->proxy_group)
+				group_tag_recalc(ob->proxy_group->dup_group);
 		} 
 	}