Commit: 0aaffc4f036355845bccb312c69ed7467105653b
Author: Julian Eisel
Date: Sat Oct 7 16:42:06 2017 +0200
Branches: topbar
https://developer.blender.org/rB0aaffc4f036355845bccb312c69ed7467105653b
Remove ED_area_global_initialize
Should be fine if global areas call ED_area_initialize now.
===================================================================
M source/blender/editors/include/ED_screen.h
M source/blender/editors/screen/area.c
M source/blender/editors/screen/screen_edit.c
===================================================================
diff --git a/source/blender/editors/include/ED_screen.h
b/source/blender/editors/include/ED_screen.h
index 5e889b59497..1e984c15b22 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -91,7 +91,6 @@ int ED_area_header_switchbutton(const struct bContext *C,
struct uiBlock *bl
/* areas */
void ED_area_initialize(struct wmWindowManager *wm, struct wmWindow *win,
struct ScrArea *sa);
void ED_area_exit(struct bContext *C, struct ScrArea *sa);
-void ED_area_global_initialize(struct wmWindowManager *wm, struct wmWindow
*win, struct ScrArea *sa);
int ED_screen_area_active(const struct bContext *C);
void ED_screen_global_areas_create(const struct bContext *C, struct
wmWindow *win);
void ED_area_do_listen(struct bScreen *sc, ScrArea *sa, struct wmNotifier
*note, const Scene *scene);
diff --git a/source/blender/editors/screen/area.c
b/source/blender/editors/screen/area.c
index cdbe13a300d..08be062aaf6 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -1574,53 +1574,6 @@ void ED_area_initialize(wmWindowManager *wm, wmWindow
*win, ScrArea *sa)
}
}
-/* XXX code duplicated from ED_area_initialize */
-void ED_area_global_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa)
-{
- const int size_x = WM_window_pixels_x(win);
- const int size_y = WM_window_pixels_y(win);
- rcti rect;
-
- sa->type = BKE_spacetype_from_id(sa->spacetype);
- for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
- ar->type = BKE_regiontype_from_id(sa->type, ar->regiontype);
- }
-
- /* area sizes */
- area_calc_totrct(sa, size_x, size_y);
-
- /* region rect sizes */
- rect = sa->totrct;
- region_rect_recursive(win, sa, sa->regionbase.first, &rect, 0, false);
-
- /* default area handlers */
- ed_default_handlers(wm, sa, &sa->handlers, sa->type->keymapflag);
- /* checks spacedata, adds own handlers */
- if (sa->type->init) {
- sa->type->init(wm, sa);
- }
-
- /* region windows, default and own handlers */
- for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
- region_subwindow(win, ar, false);
-
- if (ar->swinid) {
- /* default region handlers */
- ed_default_handlers(wm, sa, &ar->handlers,
ar->type->keymapflag);
- /* own handlers */
- if (ar->type->init) {
- ar->type->init(wm, ar);
- }
- }
- else {
- /* prevent uiblocks to run */
- UI_blocklist_free(NULL, &ar->uiblocks);
- }
- }
- /* XXX hack to force drawing */
- ED_area_tag_redraw(sa);
-}
-
static void region_update_rect(ARegion *ar)
{
ar->winx = BLI_rcti_size_x(&ar->winrct) + 1;
diff --git a/source/blender/editors/screen/screen_edit.c
b/source/blender/editors/screen/screen_edit.c
index a552fb4c108..df2619c9ea3 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -770,7 +770,6 @@ void ED_screen_refresh(wmWindowManager *wm, wmWindow *win)
const int window_size_y = WM_window_pixels_y(win);
const int screen_size_x = WM_window_screen_pixels_x(win);
const int screen_size_y = WM_window_screen_pixels_y(win);
- ScrArea *sa;
rcti window_rect;
window_rect.xmin = 0;
@@ -791,13 +790,10 @@ void ED_screen_refresh(wmWindowManager *wm, wmWindow *win)
wm_subwindow_position(win, screen->mainwin,
&window_rect, false);
}
- for (sa = win->global_areas.first; sa; sa = sa->next) {
- ED_area_global_initialize(wm, win, sa);
- }
- for (sa = screen->areabase.first; sa; sa = sa->next) {
+ ED_screen_areas_iter(win, screen, area) {
/* set spacetype and region callbacks, calls init() */
/* sets subwindows for regions, adds handlers */
- ED_area_initialize(wm, win, sa);
+ ED_area_initialize(wm, win, area);
}
/* wake up animtimer */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
