[Bf-blender-cvs] [4a4b63be128] asset-browser: Merge branch 'master' into asset-browser

[Julian Eisel]

Commit: 4a4b63be128980a60bc839a74816ac6347b1e0f4
Author: Julian Eisel
Date:   Thu Nov 19 19:53:31 2020 +0100
Branches: asset-browser
https://developer.blender.org/rB4a4b63be128980a60bc839a74816ac6347b1e0f4

Merge branch 'master' into asset-browser

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



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

diff --cc source/blender/editors/space_view3d/space_view3d.c
index 67be594fc8f,9f31e7a411d..5f471cde1e5
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@@ -472,7 -466,11 +472,11 @@@ static ID *view3d_drop_id_in_main_regio
                                                   const wmEvent *event,
                                                   ID_Type id_type)
  {
+   ScrArea *area = CTX_wm_area(C);
+   if (ED_region_overlap_isect_any_xy(area, &event->x)) {
+     return NULL;
+   }
 -  return WM_drag_ID(drag, id_type);
 +  return view3d_drop_in_main_region_poll(C, event) ? WM_drag_ID(drag, id_type) : NULL;
  }
  
  static bool view3d_drop_id_in_main_region_poll(bContext *C,