Merge branch 'refactor-mesh-selection-generic' into refactor-mesh-position-generic

8 files changed, 21 insertions, 19 deletions

diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index ee87de5774a..6079aca0199 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -101,16 +101,16 @@ typedef struct bAnimContext {
 /* Main Data container types */
 typedef enum eAnimCont_Types {
   ANIMCONT_NONE = 0,      /* invalid or no data */
-  ANIMCONT_ACTION = 1,    /* action (bAction) */
-  ANIMCONT_SHAPEKEY = 2,  /* shapekey (Key) */
+  ANIMCONT_ACTION = 1,    /* action (#bAction) */
+  ANIMCONT_SHAPEKEY = 2,  /* shape-key (#Key) */
   ANIMCONT_GPENCIL = 3,   /* grease pencil (screen) */
-  ANIMCONT_DOPESHEET = 4, /* dopesheet (bDopesheet) */
-  ANIMCONT_FCURVES = 5,   /* animation F-Curves (bDopesheet) */
-  ANIMCONT_DRIVERS = 6,   /* drivers (bDopesheet) */
-  ANIMCONT_NLA = 7,       /* nla (bDopesheet) */
-  ANIMCONT_CHANNEL = 8,   /* animation channel (bAnimListElem) */
-  ANIMCONT_MASK = 9,      /* mask dopesheet */
-  ANIMCONT_TIMELINE = 10, /* "timeline" editor (bDopeSheet) */
+  ANIMCONT_DOPESHEET = 4, /* dope-sheet (#bDopesheet) */
+  ANIMCONT_FCURVES = 5,   /* animation F-Curves (#bDopesheet) */
+  ANIMCONT_DRIVERS = 6,   /* drivers (#bDopesheet) */
+  ANIMCONT_NLA = 7,       /* NLA (#bDopesheet) */
+  ANIMCONT_CHANNEL = 8,   /* animation channel (#bAnimListElem) */
+  ANIMCONT_MASK = 9,      /* mask dope-sheet */
+  ANIMCONT_TIMELINE = 10, /* "timeline" editor (#bDopeSheet) */
 } eAnimCont_Types;
 
 /** \} */
diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h
index 1d63e01c84b..e5bcdcdd282 100644
--- a/source/blender/editors/include/ED_keyframes_edit.h
+++ b/source/blender/editors/include/ED_keyframes_edit.h
@@ -235,7 +235,7 @@ typedef enum eKeyPasteError {
   KEYFRAME_PASTE_OK,
   /* Nothing was copied */
   KEYFRAME_PASTE_NOTHING_TO_PASTE,
-  /* No F-curves was selected to paste into*/
+  /* No F-curves was selected to paste into. */
   KEYFRAME_PASTE_NOWHERE_TO_PASTE
 } eKeyPasteError;
 
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index 3dffa2ba9fc..acb0e53aa55 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -227,7 +227,7 @@ bool ED_object_base_deselect_all(const struct Scene *scene,
 /**
  * Single object duplicate, if `dupflag == 0`, fully linked, else it uses the flags given.
  * Leaves selection of base/object unaltered.
- * \note don't call this within a loop since clear_* funcs loop over the entire database.
+ * \note don't call this within a loop since clear_* functions loop over the entire database.
  * \note caller must do `DAG_relations_tag_update(bmain);`
  * this is not done automatic since we may duplicate many objects in a batch.
  */
diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index eeed1c9b286..144fa4e0b93 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -353,8 +353,8 @@ struct ScrArea *ED_screen_state_toggle(struct bContext *C,
                                        struct ScrArea *area,
                                        short state);
 /**
- * Wrapper to open a temporary space either as fullscreen space, or as separate window, as defined
- * by \a display_type.
+ * Wrapper to open a temporary space either as full-screen space, or as separate window,
+ * as defined by \a display_type.
  *
  * \param title: Title to set for the window, if a window is spawned.
  * \param x, y: Position of the window, if a window is spawned.
diff --git a/source/blender/editors/include/ED_screen_types.h b/source/blender/editors/include/ED_screen_types.h
index 21bb412d072..bf64be9f7a7 100644
--- a/source/blender/editors/include/ED_screen_types.h
+++ b/source/blender/editors/include/ED_screen_types.h
@@ -112,7 +112,7 @@ enum {
    */
   AZONE_REGION,
   /**
-   * Used when in editor fullscreen draw a corner to return to normal mode.
+   * Used when in editor full-screen draw a corner to return to normal mode.
    */
   AZONE_FULLSCREEN,
   /**
diff --git a/source/blender/editors/include/ED_space_api.h b/source/blender/editors/include/ED_space_api.h
index c69698f3f73..07d4f43bb2b 100644
--- a/source/blender/editors/include/ED_space_api.h
+++ b/source/blender/editors/include/ED_space_api.h
@@ -50,7 +50,7 @@ void ED_spacetype_spreadsheet(void);
 /** \} */
 
 /* -------------------------------------------------------------------- */
-/** \name Spacetype Static Data
+/** \name Space-type Static Data
  * Calls for instancing and freeing space-type static data called in #WM_init_exit
  * \{ */
 
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 27e2f89f684..c3376493413 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -532,6 +532,7 @@ typedef struct ARegion *(*uiButSearchTooltipFn)(struct bContext *C,
                                                 const struct rcti *item_rect,
                                                 void *arg,
                                                 void *active);
+typedef void (*uiButSearchListenFn)(const struct wmRegionListenerParams *params, void *arg);
 
 /* Must return allocated string. */
 typedef char *(*uiButToolTipFunc)(struct bContext *C, void *argN, const char *tip);
@@ -1659,6 +1660,7 @@ void UI_but_func_search_set(uiBut *but,
                             void *active);
 void UI_but_func_search_set_context_menu(uiBut *but, uiButSearchContextMenuFn context_menu_fn);
 void UI_but_func_search_set_tooltip(uiBut *but, uiButSearchTooltipFn tooltip_fn);
+void UI_but_func_search_set_listen(uiBut *but, uiButSearchListenFn listen_fn);
 /**
  * \param search_sep_string: when not NULL, this string is used as a separator,
  * showing the icon and highlighted text after the last instance of this string.
diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h
index e508c96b4f1..bdd830e0046 100644
--- a/source/blender/editors/include/UI_view2d.h
+++ b/source/blender/editors/include/UI_view2d.h
@@ -54,7 +54,7 @@ enum eView2D_CommonViewTypes {
 #define V2D_SCROLL_HEIGHT ((0.45f * U.widget_unit) + (2.0f * U.pixelsize))
 #define V2D_SCROLL_WIDTH ((0.45f * U.widget_unit) + (2.0f * U.pixelsize))
 
-/* Alpha of scrollbar when at minimum size. */
+/* Alpha of scroll-bar when at minimum size. */
 #define V2D_SCROLL_MIN_ALPHA (0.4f)
 
 /* Minimum size needs to include outline which varies with line width. */
@@ -84,7 +84,7 @@ enum eView2D_CommonViewTypes {
 /* ------------------------------------------ */
 /* Macros:                                    */
 
-/* test if mouse in a scrollbar (assume that scroller availability has been tested) */
+/* Test if mouse in a scroll-bar (assume that scroller availability has been tested). */
 #define IN_2D_VERT_SCROLL(v2d, co) (BLI_rcti_isect_pt_v(&v2d->vert, co))
 #define IN_2D_HORIZ_SCROLL(v2d, co) (BLI_rcti_isect_pt_v(&v2d->hor, co))
 
@@ -350,8 +350,8 @@ struct View2D *UI_view2d_fromcontext(const struct bContext *C);
 struct View2D *UI_view2d_fromcontext_rwin(const struct bContext *C);
 
 /**
- * Get scrollbar sizes of the current 2D view.
- * The size will be zero if the view has its scrollbars disabled.
+ * Get scroll-bar sizes of the current 2D view.
+ * The size will be zero if the view has its scroll-bars disabled.
  *
  * \param mapped: whether to use view2d_scroll_mapped which changes flags
  */