[Bf-blender-cvs] [7dbc76d801b] asset-lite-greasepencil: Merge branch 'master' into asset-lite-greasepencil

[Antonio Vazquez]

Commit: 7dbc76d801b58d9877cba19f11d65f2822c9e871
Author: Antonio Vazquez
Date:   Wed Oct 5 23:00:30 2022 +0200
Branches: asset-lite-greasepencil
https://developer.blender.org/rB7dbc76d801b58d9877cba19f11d65f2822c9e871

Merge branch 'master' into asset-lite-greasepencil

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



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

diff --cc source/blender/editors/space_view3d/space_view3d.cc
index ff7ba020700,4ac6f926818..1637c03a785
--- a/source/blender/editors/space_view3d/space_view3d.cc
+++ b/source/blender/editors/space_view3d/space_view3d.cc
@@@ -969,18 -956,10 +969,18 @@@ static void view3d_dropboxes(
                   view3d_world_drop_poll,
                   view3d_id_drop_copy,
                   WM_drag_free_imported_drag_ID,
 -                 nullptr);
 +                 NULL);
 +
 +  /* TODO(@antoniov): Change to use a temp copy using BLO_library_temp_load_id (). */
 +  WM_dropbox_add(lb,
 +                 "GPENCIL_OT_asset_import",
 +                 view3d_gpencil_drop_poll,
 +                 view3d_id_drop_copy_with_type,
 +                 WM_drag_free_imported_drag_ID,
 +                 view3d_gpencil_data_drop_tooltip);
  }
  
- static void view3d_widgets(void)
+ static void view3d_widgets()
  {
    wmGizmoMapType_Params params{SPACE_VIEW3D, RGN_TYPE_WINDOW};
    wmGizmoMapType *gzmap_type = WM_gizmomaptype_ensure(&params);