From 131fa2e00c35ff78042a4f793891eaeb880d715c Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sun, 14 Dec 2008 17:25:46 +0000 Subject: 2.5 Fix for crash on joining (previously splitted) areas. Reason was the stored regions in pushed 'spaces' not being copied. next: free running handlers on area join/split. --- source/blender/editors/screen/area.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'source/blender/editors/screen/area.c') 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); } -- cgit v1.2.3