[Bf-blender-cvs] [49707f5d835] xr-actions-D9124: Merge branch 'master' into xr-actions-D9124

[Peter Kim]

Commit: 49707f5d83528761cc34823904c4ead264bd48e2
Author: Peter Kim
Date:   Sun Mar 14 19:14:50 2021 +0900
Branches: xr-actions-D9124
https://developer.blender.org/rB49707f5d83528761cc34823904c4ead264bd48e2

Merge branch 'master' into xr-actions-D9124

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



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

diff --cc release/scripts/addons
index 0d1b80b5e21,ef3104dae30..b3c76837b9a
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 0d1b80b5e21dd7f799c4d528d69d8d6d89ebbc85
 -Subproject commit ef3104dae302dcfb08b21e32d10b548bf304bd29
++Subproject commit b3c76837b9ab55e83d6efbae7e2c8d55c0f17843
diff --cc source/blender/editors/space_api/spacetypes.c
index b05f28cfa96,adb824b8934..4c3cfd1c7d7
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@@ -260,9 -261,9 +261,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)
  {
-   LISTBASE_FOREACH (RegionDrawCB *, rdc, &art->drawcalls) {
 -  LISTBASE_FOREACH_MUTABLE (RegionDrawCB *, rdc, &region->type->drawcalls) {
++  LISTBASE_FOREACH_MUTABLE (RegionDrawCB *, rdc, &art->drawcalls) {
      if (rdc->type == type) {
        rdc->draw(C, region, rdc->customdata);