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

[Antonio Vazquez]

Commit: ed7166348528cbe48f65d82a836ab7b4b3a64d6b
Author: Antonio Vazquez
Date:   Tue Oct 26 16:55:23 2021 +0200
Branches: asset-greasepencil
https://developer.blender.org/rBed7166348528cbe48f65d82a836ab7b4b3a64d6b

Merge branch 'master' into asset-greasepencil

 Conflicts:
	source/blender/blenkernel/intern/icons.cc

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



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

diff --cc source/blender/editors/space_view3d/space_view3d.c
index 43176764d5c,8e61ff1765a..b100c930522
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@@ -554,14 -597,9 +597,14 @@@ static bool view3d_object_data_drop_pol
    return false;
  }
  
 +static bool view3d_gpencil_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event)
 +{
 +  return view3d_drop_id_in_main_region_poll(C, drag, event, ID_GD);
 +}
 +
  static char *view3d_object_data_drop_tooltip(bContext *UNUSED(C),
                                               wmDrag *UNUSED(drag),
-                                              const wmEvent *UNUSED(event),
+                                              const int UNUSED(xy[2]),
                                               wmDropBox *UNUSED(drop))
  {
    return BLI_strdup(TIP_("Create object instance from object-data"));