[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18578] branches/blender2.5/blender/source /blender/editors/screen/area.c: 2.5

[Ton Roosendaal]

Revision: 18578
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18578
Author:   ton
Date:     2009-01-19 19:50:35 +0100 (Mon, 19 Jan 2009)

Log Message:
-----------
2.5

Bugfix for previous View3D split commit: on file read, the area-
spacetypes are not set yet, needs BKE_spacetype_from_id() there.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/screen/area.c

Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/area.c	2009-01-19 18:36:54 UTC (rev 18577)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c	2009-01-19 18:50:35 UTC (rev 18578)
@@ -597,6 +597,7 @@
 /* area vertices were set */
 void area_copy_data(ScrArea *sa1, ScrArea *sa2, int swap_space)
 {
+	SpaceType *st;
 	ARegion *ar;
 	
 	sa1->headertype= sa2->headertype;
@@ -615,12 +616,14 @@
 	}
 	
 	/* regions */
+	st= BKE_spacetype_from_id(sa1->spacetype);
 	for(ar= sa1->regionbase.first; ar; ar= ar->next)
-		BKE_area_region_free(sa1->type, ar);
+		BKE_area_region_free(st, ar);
 	BLI_freelistN(&sa1->regionbase);
 	
+	st= BKE_spacetype_from_id(sa2->spacetype);
 	for(ar= sa2->regionbase.first; ar; ar= ar->next) {
-		ARegion *newar= BKE_area_region_copy(sa2->type, ar);
+		ARegion *newar= BKE_area_region_copy(st, ar);
 		BLI_addtail(&sa1->regionbase, newar);
 	}