diff options
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r-- | source/blender/editors/screen/area.c | 19 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 2 |
2 files changed, 3 insertions, 18 deletions
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); |