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

[Antonio Vazquez]

Commit: b5fd23c4f2a6021b703f6a65ee19adfbbc40b320
Author: Antonio Vazquez
Date:   Wed Aug 4 16:05:00 2021 +0200
Branches: asset-greasepencil
https://developer.blender.org/rBb5fd23c4f2a6021b703f6a65ee19adfbbc40b320

Merge branch 'master' into asset-greasepencil

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



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

diff --cc source/blender/editors/space_view3d/space_view3d.c
index 6f4c81f861e,0803b4c4776..06fc2cf1dcc
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@@ -537,14 -548,10 +548,15 @@@ 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 wmEvent *UNUSED(event),
+                                              wmDropBox *UNUSED(drop))
  {
    return BLI_strdup(TIP_("Create object instance from object-data"));
  }