diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-12 18:26:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-12 18:26:38 +0300 |
commit | 760e79d8092a121b9d0e1cd02019478c808acae9 (patch) | |
tree | dfd5050507b6a3c87a7314abd805fc792083c947 /source/blender/editors/screen | |
parent | ec4ce908db6124037c4dfd927f22a9eec0ba4d52 (diff) |
WM: rename BKE_regiontype_from_id
This returns the first as a fallback, causing confusing usage.
Renamed and added a version of the function that doesn't.
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r-- | source/blender/editors/screen/area.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_edit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 3f365fc1500..6e4cbf27e28 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1452,7 +1452,7 @@ void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa) } for (ar = sa->regionbase.first; ar; ar = ar->next) - ar->type = BKE_regiontype_from_id(sa->type, ar->regiontype); + ar->type = BKE_regiontype_from_id_or_first(sa->type, ar->regiontype); /* area sizes */ area_calc_totrct(sa, WM_window_pixels_x(win), WM_window_pixels_y(win)); diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 0e32ec3c34f..d1b14c7bd31 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -897,7 +897,7 @@ static void screen_refresh_headersizes(void) SpaceType *st; for (st = lb->first; st; st = st->next) { - ARegionType *art = BKE_regiontype_from_id(st, RGN_TYPE_HEADER); + ARegionType *art = BKE_regiontype_from_id_or_first(st, RGN_TYPE_HEADER); if (art) art->prefsizey = ED_area_headersize(); } } |