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

[Peter Kim]

Commit: d8cf5e7f4d7daac89a42319d351b34d618092bd7
Author: Peter Kim
Date:   Sun Mar 7 18:54:26 2021 +0900
Branches: xr-actions-D9124
https://developer.blender.org/rBd8cf5e7f4d7daac89a42319d351b34d618092bd7

Merge branch 'master' into xr-actions-D9124

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



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

diff --cc release/scripts/addons
index eba08497327,24e756c0da8..0d1b80b5e21
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit eba0849732791a1774dd2c26c3f5da9dae0e33ec
 -Subproject commit 24e756c0da89bdbf88dc22163ae3b7ef4f1fbb73
++Subproject commit 0d1b80b5e21dd7f799c4d528d69d8d6d89ebbc85
diff --cc source/blender/editors/include/ED_space_api.h
index 95c36fc69a0,fc474ea464d..feda63fcb2f
--- a/source/blender/editors/include/ED_space_api.h
+++ b/source/blender/editors/include/ED_space_api.h
@@@ -71,14 -71,11 +71,12 @@@ void *ED_region_draw_cb_activate(struc
                                   void (*draw)(const struct bContext *, struct ARegion *, void *),
                                   void *customdata,
                                   int type);
 -void ED_region_draw_cb_draw(const struct bContext *, struct ARegion *, int);
 +void ED_region_draw_cb_draw(const struct bContext *C, struct ARegion *region, int type);
 +void ED_region_surface_draw_cb_draw(struct ARegionType *art, int type);
- void ED_region_draw_cb_exit(struct ARegionType *art, void *handle);
- /* generic callbacks */
- /* ed_util.c */
- void ED_region_draw_mouse_line_cb(const struct bContext *C,
-                                   struct ARegion *region,
-                                   void *arg_info);
+ void ED_region_draw_cb_exit(struct ARegionType *, void *);
+ void ED_region_draw_cb_remove_by_type(struct ARegionType *art,
+                                       void *draw_fn,
+                                       void (*free)(void *));
  
  #ifdef __cplusplus
  }
diff --cc source/blender/editors/space_api/spacetypes.c
index 42c0918906a,1bd8d13b25b..b05f28cfa96
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@@ -272,16 -272,19 +272,29 @@@ static void ed_region_draw_cb_draw(cons
    }
  }
  
 +void ED_region_draw_cb_draw(const bContext *C, ARegion *region, int type)
 +{
 +  ed_region_draw_cb_draw(C, region, region->type, type);
 +}
 +
 +void ED_region_surface_draw_cb_draw(ARegionType *art, int type)
 +{
 +  ed_region_draw_cb_draw(NULL, NULL, art, type);
 +}
 +
+ void ED_region_draw_cb_remove_by_type(ARegionType *art, void *draw_fn, void (*free)(void *))
+ {
+   LISTBASE_FOREACH_MUTABLE (RegionDrawCB *, rdc, &art->drawcalls) {
+     if (rdc->draw == draw_fn) {
+       if (free) {
+         free(rdc->customdata);
+       }
+       BLI_remlink(&art->drawcalls, rdc);
+       MEM_freeN(rdc);
+     }
+   }
+ }
+ 
  /* ********************* space template *********************** */
  /* forward declare */
  void ED_spacetype_xxx(void);
diff --cc source/blender/makesdna/DNA_windowmanager_types.h
index 857579b8faa,68d69a671ba..62a03fda801
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@@ -355,12 -362,8 +362,12 @@@ typedef struct wmKeyMapItem 
    short val;
    /** Oskey is apple or windowskey, value denotes order of pressed. */
    short shift, ctrl, alt, oskey;
-   /** Rawkey modifier. */
+   /** Raw-key modifier. */
    short keymodifier;
 +  /** XR action set name. */
 +  char xr_action_set[64];
 +  /** XR action name. */
 +  char xr_action[64];
  
    /* flag: inactive, expanded */
    short flag;