6 files changed, 11 insertions, 50 deletions
diff --git a/source/blender/makesdna/DNA_effect_types.h b/source/blender/makesdna/DNA_effect_types.h
index 46ce9b7d017..86ffb0fc4ad 100644
--- a/source/blender/makesdna/DNA_effect_types.h
+++ b/source/blender/makesdna/DNA_effect_types.h
@@ -104,6 +104,7 @@ typedef struct Particle {
 	short mat_nr, rt;
 } Particle;
 
+struct Group;
 
 typedef struct PartEff {
 	struct PartEff *next, *prev;
@@ -125,7 +126,9 @@ typedef struct PartEff {
 	short disp, vertgroup_v;
 	
 	char vgroupname[32], vgroupname_v[32];
+	
 	Particle *keys;
+	struct Group *group;
 	
 } PartEff;
 
diff --git a/source/blender/makesdna/DNA_group_types.h b/source/blender/makesdna/DNA_group_types.h
index f7139101476..2ee699839ed 100644
--- a/source/blender/makesdna/DNA_group_types.h
+++ b/source/blender/makesdna/DNA_group_types.h
@@ -38,50 +38,11 @@
 #include "DNA_ID.h"
 
 struct Object;
-struct Ipo;
-
-typedef struct GroupKey {
-	struct GroupKey *next, *prev;
-	short sfra, efra;
-	float cfra;
-	char name[32];
-} GroupKey;
-
-typedef struct ObjectKey {
-	struct ObjectKey *next, *prev;
-	GroupKey *gkey;		/* for reference */
-
-	/* copy of relevant data */
-	short partype, pad;
-	int par1, par2, par3;
-	
-	struct Object *parent, *track;
-	struct Ipo *ipo;
-
-	/* this block identical to object */	
-	float loc[3], dloc[3], orig[3];
-	float size[3], dsize[3];
-	float rot[3], drot[3];
-	float quat[4], dquat[4];
-	float obmat[4][4];
-	float parentinv[4][4];
-	float imat[4][4];	/* voor bij render, tijdens simulate, tijdelijk: ipokeys van transform  */
-	
-	unsigned int lay;				/* kopie van Base */
-	
-	char transflag, ipoflag;
-	char trackflag, upflag;
-	
-	float sf, ctime, padf;
-		
-
-} ObjectKey;
 
 typedef struct GroupObject {
 	struct GroupObject *next, *prev;
 	struct Object *ob;
-	ListBase okey;		/* ObjectKey */
-	
+	void *lampren;		/* used while render */
 } GroupObject;
 
 
@@ -89,11 +50,9 @@ typedef struct Group {
 	ID id;
 	
 	ListBase gobject;	/* GroupObject */
-	ListBase gkey;		/* GroupKey */
-	
-	GroupKey *active;
 	
 } Group;
 
+
 #endif
 
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 3f74370ac1f..bbe7d0f8125 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -46,6 +46,7 @@ struct MTex;
 struct Ipo;
 struct Material;
 struct ColorBand;
+struct Group;
 
 typedef struct MaterialLayer {
 	struct MaterialLayer *next, *prev;
@@ -109,6 +110,7 @@ typedef struct Material {
 	struct MTex *mtex[10];
 	ListBase layers;
 	struct Ipo *ipo;
+	struct Group *group;
 	
 	/* dynamic properties */
 	float friction, fh, reflect;
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 1d16015a628..88075e718de 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -188,10 +188,7 @@ typedef struct Object {
 	
 	struct PartDeflect *pd;		/* particle deflector/attractor/collision data */
 	struct SoftBody *soft;		/* if exists, saved in file */
-	struct Life *life;
-
-	LBuf lbuf;
-	LBuf port;
+	struct Group *dup_group;	/* object duplicator for group */
 	
 	short fluidsimFlag;			/* NT toggle fluidsim participation on/off */
 	char shapenr, shapeflag;	/* current shape key for menu or pinned, flag for pinning */
@@ -262,13 +259,13 @@ extern Object workob;
 #define OB_OFFS_LOCAL	1
 #define OB_QUAT			2
 #define OB_NEG_SCALE	4
-#define OB_DUPLI		(8+16)
+#define OB_DUPLI		(8+16+256)
 #define OB_DUPLIFRAMES	8
 #define OB_DUPLIVERTS	16
 #define OB_DUPLIROT		32
 #define OB_DUPLINOSPEED	64
-
 #define OB_POWERTRACK	128
+#define OB_DUPLIGROUP	256
 
 /* (short) ipoflag */
 #define OB_DRAWKEY			1
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 6323caeda6c..968aa6abe56 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -289,7 +289,6 @@ typedef struct Scene {
 	
 	ListBase base;
 	struct Base *basact;
-	struct Group *group;
 	
 	float cursor[3];
 	float twcent[3];			/* center for transform widget */
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 7007981ff64..5a7e84c62ef 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -483,6 +483,7 @@ typedef struct SpaceImaSel {
 #define SO_SELECTED		3
 #define SO_ACTIVE		4
 #define SO_SAME_TYPE	5
+#define SO_GROUPS		6
 
 /* SpaceOops->storeflag */
 #define SO_TREESTORE_CLEANUP	1