[Bf-blender-cvs] [c0a00ee6675] asset-browser: Merge branch 'asset-metadata' into asset-browser

[Julian Eisel]

Commit: c0a00ee6675357fcd3dcd57b0b16d89e2b6236e3
Author: Julian Eisel
Date:   Thu Sep 10 18:51:34 2020 +0200
Branches: asset-browser
https://developer.blender.org/rBc0a00ee6675357fcd3dcd57b0b16d89e2b6236e3

Merge branch 'asset-metadata' into asset-browser

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



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

diff --cc source/blender/editors/space_view3d/space_view3d.c
index 1bd6e89e278,4fdfc18c9ff..1874cb8f2b0
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@@ -468,9 -470,17 +470,17 @@@ static ID *view3d_drop_id_in_main_regio
    if (ED_region_overlap_isect_any_xy(area, &event->x)) {
      return false;
    }
 -  return WM_drag_ID(drag, id_type);
 +  return WM_drag_ID(drag, id_type) || WM_drag_asset_data(drag, id_type);
  }
  
+ static bool view3d_drop_id_in_main_region_poll(bContext *C,
+                                                wmDrag *drag,
+                                                const wmEvent *event,
+                                                ID_Type id_type)
+ {
+   return (view3d_drop_id_in_main_region_poll_id(C, drag, event, id_type) != NULL);
+ }
+ 
  static bool view3d_ob_drop_poll(bContext *C,
                                  wmDrag *drag,
                                  const wmEvent *event,
@@@ -591,9 -616,17 +616,17 @@@ static void view3d_id_drop_copy(wmDrag 
    RNA_string_set(drop->ptr, "name", id->name + 2);
  }
  
+ static void view3d_id_drop_copy_with_type(wmDrag *drag, wmDropBox *drop)
+ {
+   ID *id = WM_drag_ID(drag, 0);
+ 
+   RNA_string_set(drop->ptr, "name", id->name + 2);
+   RNA_enum_set(drop->ptr, "type", GS(id->name));
+ }
+ 
  static void view3d_id_path_drop_copy(wmDrag *drag, wmDropBox *drop)
  {
 -  ID *id = WM_drag_ID(drag, 0);
 +  ID *id = WM_drag_asset_id(drag, 0);
  
    if (id) {
      RNA_string_set(drop->ptr, "name", id->name + 2);
diff --cc source/blender/windowmanager/WM_api.h
index fe614010ea5,80f330d91ca..5510d20f1c3
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@@ -673,11 -675,8 +676,11 @@@ void WM_drag_add_ID(struct wmDrag *drag
  struct ID *WM_drag_ID(const struct wmDrag *drag, short idcode);
  struct ID *WM_drag_ID_from_event(const struct wmEvent *event, short idcode);
  
 +struct wmDragAsset *WM_drag_asset_data(const struct wmDrag *drag, int idcode);
 +struct ID *WM_drag_asset_id(const struct wmDrag *drag, int idcode);
 +
  /* Set OpenGL viewport and scissor */
- void wmViewport(const struct rcti *rect);
+ void wmViewport(const struct rcti *winrct);
  void wmPartialViewport(rcti *drawrct, const rcti *winrct, const rcti *partialrct);
  void wmWindowViewport(struct wmWindow *win);