[Bf-blender-cvs] [c7d75a66163] master: Merge branch 'blender-v2.92-release'

[Brecht Van Lommel]

Commit: c7d75a66163635ec7629eda2d4aa39b9e197ef6a
Author: Brecht Van Lommel
Date:   Fri Jan 29 15:55:41 2021 +0100
Branches: master
https://developer.blender.org/rBc7d75a66163635ec7629eda2d4aa39b9e197ef6a

Merge branch 'blender-v2.92-release'

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



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

diff --cc source/blender/blenkernel/BKE_screen.h
index e9a141709b5,7b5df98d148..2fc0caf1a2c
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@@ -138,23 -134,6 +138,24 @@@ typedef struct SpaceType 
  
  /* region types are also defined using spacetypes_init, via a callback */
  
 +typedef struct wmRegionListenerParams {
++  struct wmWindow *window;
 +  struct ScrArea *area; /* Can be NULL when the region is not part of an area. */
 +  struct ARegion *region;
 +  struct wmNotifier *notifier;
 +  const struct Scene *scene;
 +} wmRegionListenerParams;
 +
 +typedef struct wmRegionMessageSubscribeParams {
 +  const struct bContext *context;
 +  struct wmMsgBus *message_bus;
 +  struct WorkSpace *workspace;
 +  struct Scene *scene;
 +  struct bScreen *screen;
 +  struct ScrArea *area;
 +  struct ARegion *region;
 +} wmRegionMessageSubscribeParams;
 +
  typedef struct ARegionType {
    struct ARegionType *next, *prev;
  
diff --cc source/blender/editors/space_view3d/space_view3d.c
index 215166a6158,4c168c7a243..82cc499c729
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@@ -797,12 -784,9 +798,13 @@@ static void *view3d_main_region_duplica
    return NULL;
  }
  
 -static void view3d_main_region_listener(
 -    wmWindow *win, ScrArea *area, ARegion *region, wmNotifier *wmn, const Scene *scene)
 +static void view3d_main_region_listener(const wmRegionListenerParams *params)
  {
++  wmWindow *window = params->window;
 +  ScrArea *area = params->area;
 +  ARegion *region = params->region;
 +  wmNotifier *wmn = params->notifier;
 +  const Scene *scene = params->scene;
    View3D *v3d = area->spacedata.first;
    RegionView3D *rv3d = region->regiondata;
    wmGizmoMap *gzmap = region->gizmo_map;
@@@ -1018,11 -1002,17 +1020,17 @@@
          if (wmn->subtype == NS_VIEW3D_GPU) {
            rv3d->rflag |= RV3D_GPULIGHT_UPDATE;
          }
- #ifdef WITH_XR_OPENXR
          else if (wmn->subtype == NS_VIEW3D_SHADING) {
+ #ifdef WITH_XR_OPENXR
            ED_view3d_xr_shading_update(G_MAIN->wm.first, v3d, scene);
-         }
  #endif
+ 
 -          ViewLayer *view_layer = WM_window_get_active_view_layer(win);
++          ViewLayer *view_layer = WM_window_get_active_view_layer(window);
+           Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer);
+           if (depsgraph) {
 -            ED_render_view3d_update(depsgraph, win, area, true);
++            ED_render_view3d_update(depsgraph, window, area, true);
+           }
+         }
          ED_region_tag_redraw(region);
          WM_gizmomap_tag_refresh(gzmap);
        }
diff --cc source/blender/windowmanager/intern/wm_event_system.c
index 67372675805,859336d0338..17f4713ff96
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@@ -543,31 -543,13 +543,33 @@@ void wm_event_do_notifiers(bContext *C
          ED_screen_do_listen(C, note);
  
          LISTBASE_FOREACH (ARegion *, region, &screen->regionbase) {
 -          ED_region_do_listen(win, NULL, region, note, scene);
 +          wmRegionListenerParams region_params = {
++              .window = win,
 +              .area = NULL,
 +              .region = region,
 +              .scene = scene,
 +              .notifier = note,
 +          };
 +          ED_region_do_listen(&region_params);
          }
  
          ED_screen_areas_iter (win, screen, area) {
 -          ED_area_do_listen(win, area, note, scene);
 +          wmSpaceTypeListenerParams area_params = {
 +              .window = win,
 +              .area = area,
 +              .notifier = note,
 +              .scene = scene,
 +          };
 +          ED_area_do_listen(&area_params);
            LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
 -            ED_region_do_listen(win, area, region, note, scene);
 +            wmRegionListenerParams region_params = {
++                .window = win,
 +                .area = area,
 +                .region = region,
 +                .scene = scene,
 +                .notifier = note,
 +            };
 +            ED_region_do_listen(&region_params);
            }
          }
        }