[Bf-blender-cvs] [2092d39dfdf] xr-actions-D9124: Fix merge-related error

[Peter Kim]

Commit: 2092d39dfdff65c10e5590d839e82b7f8938b5a9
Author: Peter Kim
Date:   Sun Jan 31 23:51:36 2021 +0900
Branches: xr-actions-D9124
https://developer.blender.org/rB2092d39dfdff65c10e5590d839e82b7f8938b5a9

Fix merge-related error

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

M       source/blender/editors/space_api/spacetypes.c

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

diff --git a/source/blender/editors/space_api/spacetypes.c 
b/source/blender/editors/space_api/spacetypes.c
index d06d1d30fe2..65433d70ab8 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -262,7 +262,7 @@ void ED_region_draw_cb_exit(ARegionType *art, void *handle)
 
 static void ed_region_draw_cb_draw(const bContext *C, ARegion *region, 
ARegionType *art, int type)
 {
-  LISTBASE_FOREACH (RegionDrawCB *, rdc, &region->type->drawcalls) {
+  LISTBASE_FOREACH (RegionDrawCB *, rdc, &art->drawcalls) {
     if (rdc->type == type) {
       rdc->draw(C, region, rdc->customdata);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs