[Bf-blender-cvs] [fcad13b5964] asset-greasepencil: Merge branch 'master' into asset-greasepencil

[Antonio Vazquez]

Commit: fcad13b5964d0e6f4783e886c8a712c2ea499de0
Author: Antonio Vazquez
Date:   Tue Aug 3 10:39:30 2021 +0200
Branches: asset-greasepencil
https://developer.blender.org/rBfcad13b5964d0e6f4783e886c8a712c2ea499de0

Merge branch 'master' into asset-greasepencil

 Conflicts:
	source/blender/editors/space_view3d/space_view3d.c

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



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

diff --cc source/blender/editors/space_view3d/space_view3d.c
index c672bdc8656,a2564469c16..889d338e4f0
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@@ -738,13 -718,8 +718,15 @@@ static void view3d_dropboxes(void
                   "OBJECT_OT_data_instance_add",
                   view3d_object_data_drop_poll,
                   view3d_id_drop_copy_with_type,
-                  WM_drag_free_imported_drag_ID);
+                  WM_drag_free_imported_drag_ID,
+                  view3d_object_data_drop_tooltip);
 +  WM_dropbox_add(lb,
 +                 "GPENCIL_OT_asset_import",
 +                 view3d_gpencil_data_drop_poll,
 +                 // TODO: Change to use a temp copy using BLO_library_temp_load_id ()
 +                 view3d_id_drop_copy_with_type,
-                  WM_drag_free_imported_drag_ID);
++                 WM_drag_free_imported_drag_ID,
++                 view3d_object_data_drop_tooltip);
  }
  
  static void view3d_widgets(void)