[Bf-blender-cvs] [2c65710c9a6] ui-asset-view-template: Merge branch 'master' into ui-asset-view-template

[Julian Eisel]

Commit: 2c65710c9a63fd57f56090c0adda9b56cbf1b20a
Author: Julian Eisel
Date:   Wed Mar 24 14:35:45 2021 +0100
Branches: ui-asset-view-template
https://developer.blender.org/rB2c65710c9a63fd57f56090c0adda9b56cbf1b20a

Merge branch 'master' into ui-asset-view-template

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index ac06886b3c9,31e4b659c2f..80cd21338d6
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -52,7 -52,7 +52,8 @@@
  
  #include "BKE_animsys.h"
  #include "BKE_armature.h"
 +#include "BKE_asset.h"
+ #include "BKE_attribute.h"
  #include "BKE_collection.h"
  #include "BKE_colortools.h"
  #include "BKE_cryptomatte.h"
@@@ -1917,21 -1936,5 +1937,14 @@@ void blo_do_versions_290(FileData *fd, 
     */
    {
      /* Keep this block, even when empty. */
- 
-     if (!DNA_struct_elem_find(fd->filesdna, "Light", "float", "diff_fac")) {
-       LISTBASE_FOREACH (Light *, light, &bmain->lights) {
-         light->diff_fac = 1.0f;
-         light->volume_fac = 1.0f;
-       }
-     }
    }
 +
 +  {
 +    if (!DNA_struct_elem_find(
 +            fd->filesdna, "WorkSpace", "AssetLibraryReference", "active_asset_library")) {
 +      LISTBASE_FOREACH (WorkSpace *, workspace, &bmain->workspaces) {
 +        BKE_asset_library_reference_init_default(&workspace->active_asset_library);
 +      }
 +    }
 +  }
  }
diff --cc source/blender/editors/interface/interface_handlers.c
index 5b28a13eb6c,a5a5a69728e..01fd9b5a82c
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@@ -1645,9 -1594,9 +1645,9 @@@ static int ui_handler_region_drag_toggl
  
    if (done) {
      wmWindow *win = CTX_wm_window(C);
-     ARegion *region = CTX_wm_region(C);
+     const ARegion *region = CTX_wm_region(C);
      uiBut *but = ui_but_find_mouse_over_ex(
 -        region, drag_info->xy_init[0], drag_info->xy_init[1], true);
 +        region, drag_info->xy_init[0], drag_info->xy_init[1], true, NULL);
  
      if (but) {
        ui_apply_but_undo(but);
diff --cc source/blender/editors/interface/interface_intern.h
index dfd2175bcd1,4c96512b4f3..7a2c33fb569
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@@ -1118,13 -1110,11 +1120,13 @@@ bool ui_but_contains_point_px(const uiB
  uiBut *ui_list_find_mouse_over(struct ARegion *region,
                                 const struct wmEvent *event) ATTR_WARN_UNUSED_RESULT;
  
 +typedef bool (*uiButFindPoll)(const uiBut *but);
- uiBut *ui_but_find_mouse_over_ex(struct ARegion *region,
+ uiBut *ui_but_find_mouse_over_ex(const struct ARegion *region,
                                   const int x,
                                   const int y,
 -                                 const bool labeledit) ATTR_WARN_UNUSED_RESULT;
 +                                 const bool labeledit,
 +                                 uiButFindPoll find_poll) ATTR_WARN_UNUSED_RESULT;
- uiBut *ui_but_find_mouse_over(struct ARegion *region,
+ uiBut *ui_but_find_mouse_over(const struct ARegion *region,
                                const struct wmEvent *event) ATTR_WARN_UNUSED_RESULT;
  uiBut *ui_but_find_rect_over(const struct ARegion *region,
                               const rcti *rect_px) ATTR_WARN_UNUSED_RESULT;
diff --cc source/blender/editors/interface/interface_query.c
index 3123e1764b6,aa10d092f5e..aaed1b779a1
--- a/source/blender/editors/interface/interface_query.c
+++ b/source/blender/editors/interface/interface_query.c
@@@ -265,8 -265,10 +265,8 @@@ bool ui_but_contains_point_px_icon(cons
  }
  
  /* x and y are only used in case event is NULL... */
 -uiBut *ui_but_find_mouse_over_ex(const ARegion *region,
 -                                 const int x,
 -                                 const int y,
 -                                 const bool labeledit)
 +uiBut *ui_but_find_mouse_over_ex(
-     ARegion *region, const int x, const int y, const bool labeledit, uiButFindPoll find_poll)
++    const ARegion *region, const int x, const int y, const bool labeledit, uiButFindPoll find_poll)
  {
    uiBut *butover = NULL;
  
@@@ -307,9 -306,9 +307,9 @@@
    return butover;
  }
  
- uiBut *ui_but_find_mouse_over(ARegion *region, const wmEvent *event)
+ uiBut *ui_but_find_mouse_over(const ARegion *region, const wmEvent *event)
  {
 -  return ui_but_find_mouse_over_ex(region, event->x, event->y, event->ctrl != 0);
 +  return ui_but_find_mouse_over_ex(region, event->x, event->y, event->ctrl != 0, NULL);
  }
  
  uiBut *ui_but_find_rect_over(const struct ARegion *region, const rcti *rect_px)