6 files changed, 61 insertions, 35 deletions

diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h
index 77179122b6e..5a679b6475f 100644
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@ -108,10 +108,6 @@ typedef struct ARegionType {
 } ARegionType;
 
 
-void BKE_screen_area_free(struct ScrArea *sa);
-void BKE_area_region_free(struct ARegion *ar);
-void free_screen(struct bScreen *sc); 
-
 /* spacetypes */
 struct SpaceType *BKE_spacetype_from_id(int spaceid);
 const struct ListBase *BKE_spacetypes_list(void);
@@ -122,5 +118,14 @@ void BKE_spacetypes_free(void);	/* only for quitting blender */
 void BKE_spacedata_freelist(ListBase *lb);
 void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2);
 
+/* area/regions */
+struct ARegion *BKE_area_region_copy(struct ARegion *ar);
+void	BKE_area_region_free(struct ARegion *ar);
+
+void BKE_screen_area_free(struct ScrArea *sa);
+
+void free_screen(struct bScreen *sc); 
+
+
 #endif
 
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index c9e1521a90e..74e30984436 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -57,10 +57,9 @@ static void spacetype_free(SpaceType *st)
 
 void BKE_spacetypes_free(void)
 {
-	SpaceType *st, *stn;
+	SpaceType *st;
 	
-	for(st= spacetypes.first; st; st= stn) {
-		stn= st->next;
+	for(st= spacetypes.first; st; st= st->next) {
 		spacetype_free(st);
 	}
 	
@@ -102,16 +101,14 @@ void BKE_spacetype_register(SpaceType *st)
 
 void BKE_spacedata_freelist(ListBase *lb)
 {
-	SpaceLink *sl, *sln;
-	ARegion *ar, *arn;
+	SpaceLink *sl;
+	ARegion *ar;
 	
-	for (sl= lb->first; sl; sl= sln) {
+	for (sl= lb->first; sl; sl= sl->next) {
 		SpaceType *st= BKE_spacetype_from_id(sl->spacetype);
-		sln= sl->next;
 		
-		/* regions for pushed spaces */
-		for(ar=sl->regionbase.first; ar; ar=arn) {
-			arn= ar->next;
+		/* free regions for pushed spaces */
+		for(ar=sl->regionbase.first; ar; ar=ar->next) {
 			BKE_area_region_free(ar);
 		}
 		BLI_freelistN(&sl->regionbase);
@@ -123,6 +120,37 @@ void BKE_spacedata_freelist(ListBase *lb)
 	BLI_freelistN(lb);
 }
 
+ARegion *BKE_area_region_copy(ARegion *ar)
+{
+	ARegion *newar= MEM_dupallocN(ar);
+	
+	newar->handlers.first= newar->handlers.last= NULL;
+	newar->uiblocks.first= newar->uiblocks.last= NULL;
+	newar->swinid= 0;
+	
+	/* XXX regiondata callback */
+	if(ar->regiondata)
+		newar->regiondata= MEM_dupallocN(ar->regiondata);
+	
+	return newar;
+}
+
+
+/* from lb2 to lb1, lb1 is supposed to be free'd */
+static void region_copylist(ListBase *lb1, ListBase *lb2)
+{
+	ARegion *ar;
+	
+	/* to be sure */
+	lb1->first= lb1->last= NULL;
+	
+	for(ar= lb2->first; ar; ar= ar->next) {
+		ARegion *arnew= BKE_area_region_copy(ar);
+		BLI_addtail(lb1, arnew);
+	}
+}
+
+
 /* lb1 should be empty */
 void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2)
 {
@@ -133,8 +161,13 @@ void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2)
 	for (sl= lb2->first; sl; sl= sl->next) {
 		SpaceType *st= BKE_spacetype_from_id(sl->spacetype);
 		
-		if(st && st->duplicate)
-			BLI_addtail(lb1, st->duplicate(sl));
+		if(st && st->duplicate) {
+			SpaceLink *slnew= st->duplicate(sl);
+			
+			BLI_addtail(lb1, slnew);
+			
+			region_copylist(&slnew->regionbase, &sl->regionbase);
+		}
 	}
 }
 
diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index 7292cc87366..2cb394da2b0 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -46,7 +46,6 @@ void	ED_region_do_draw(struct bContext *C, struct ARegion *ar);
 void	ED_region_exit(struct bContext *C, struct ARegion *ar);
 void	ED_region_pixelspace(const struct bContext *C, struct ARegion *ar);
 void	ED_region_init(struct bContext *C, struct ARegion *ar);
-ARegion *ED_region_copy(ARegion *ar);
 
 /* spaces */
 void	ED_spacetypes_init(void);
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 066b110e457..fc6ed8cee54 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -431,21 +431,6 @@ void ED_region_init(bContext *C, ARegion *ar)
 }
 
 
-ARegion *ED_region_copy(ARegion *ar)
-{
-	ARegion *newar= MEM_dupallocN(ar);
-	
-	newar->handlers.first= newar->handlers.last= NULL;
-	newar->uiblocks.first= newar->uiblocks.last= NULL;
-	newar->swinid= 0;
-	
-	/* XXX regiondata */
-	if(ar->regiondata)
-		newar->regiondata= MEM_dupallocN(ar->regiondata);
-	
-	return newar;
-}
-
 /* sa2 to sa1, we swap spaces for fullscreen to keep all allocated data */
 /* area vertices were set */
 void area_copy_data(ScrArea *sa1, ScrArea *sa2, int swap_space)
@@ -485,11 +470,11 @@ void area_copy_data(ScrArea *sa1, ScrArea *sa2, int swap_space)
 		}
 	}
 	
-	/* regions */
+	/* regions... XXX */
 	BLI_freelistN(&sa1->regionbase);
 	
 	for(ar= sa2->regionbase.first; ar; ar= ar->next) {
-		ARegion *newar= ED_region_copy(ar);
+		ARegion *newar= BKE_area_region_copy(ar);
 		BLI_addtail(&sa1->regionbase, newar);
 	}
 		
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index e36e843b846..9a96edf243c 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -1208,7 +1208,7 @@ void ED_SCR_OT_repeat_last(wmOperatorType *ot)
 /* insert a region in the area region list */
 static int region_split_exec(bContext *C, wmOperator *op)
 {
-	ARegion *newar= ED_region_copy(C->region);
+	ARegion *newar= BKE_area_region_copy(C->region);
 	int dir= RNA_enum_get(op->ptr, "dir");
 	
 	BLI_insertlinkafter(&C->area->regionbase, C->region, newar);
diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c
index b53e5ce427d..923710d22b3 100644
--- a/source/blender/editors/space_outliner/space_outliner.c
+++ b/source/blender/editors/space_outliner/space_outliner.c
@@ -548,6 +548,10 @@ static SpaceLink *outliner_duplicate(SpaceLink *sl)
 	if(soutlinern->rnapath)
 		soutlinern->rnapath= MEM_dupallocN(soutlinern->rnapath);
 	
+	soutlinern->oops.first= soutlinern->oops.last= NULL;
+	soutlinern->tree.first= soutlinern->tree.last= NULL;
+	soutlinern->treestore= NULL;
+	
 	return (SpaceLink *)soutlinern;
 }