[Bf-blender-cvs] [412ea630639] xr-actions-D9124: Merge branch 'master' into xr-actions-D9124

[Peter Kim]

Commit: 412ea63063995b6d52daee0008e6fe9e6ec92198
Author: Peter Kim
Date:   Sun Jan 31 22:31:07 2021 +0900
Branches: xr-actions-D9124
https://developer.blender.org/rB412ea63063995b6d52daee0008e6fe9e6ec92198

Merge branch 'master' into xr-actions-D9124

===================================================================



===================================================================

diff --cc source/blender/editors/space_api/spacetypes.c
index e27cfc4a7c5,01e57eab7c2..d06d1d30fe2
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@@ -272,11 -260,9 +260,9 @@@ void ED_region_draw_cb_exit(ARegionTyp
    }
  }
  
 -void ED_region_draw_cb_draw(const bContext *C, ARegion *region, int type)
 +static void ed_region_draw_cb_draw(const bContext *C, ARegion *region, ARegionType *art, int type)
  {
-   RegionDrawCB *rdc;
- 
-   for (rdc = art->drawcalls.first; rdc; rdc = rdc->next) {
+   LISTBASE_FOREACH (RegionDrawCB *, rdc, &region->type->drawcalls) {
      if (rdc->type == type) {
        rdc->draw(C, region, rdc->customdata);