[Bf-blender-cvs] [2b4a4e2bae9] asset-lite-greasepencil: Merge branch 'master' into asset-lite-greasepencil

[Antonio Vazquez]

Commit: 2b4a4e2bae99b948529852e2998a080ddcf78ed2
Author: Antonio Vazquez
Date:   Fri Oct 14 16:27:49 2022 +0200
Branches: asset-lite-greasepencil
https://developer.blender.org/rB2b4a4e2bae99b948529852e2998a080ddcf78ed2

Merge branch 'master' into asset-lite-greasepencil

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



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

diff --cc source/blender/editors/space_view3d/space_view3d.cc
index 1637c03a785,635fbd75d74..447d4bf8e1c
--- a/source/blender/editors/space_view3d/space_view3d.cc
+++ b/source/blender/editors/space_view3d/space_view3d.cc
@@@ -629,14 -629,9 +629,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 * /*C*/,
                                               wmDrag * /*drag*/,
-                                              const int UNUSED(xy[2]),
+                                              const int /*xy*/[2],
                                               wmDropBox * /*drop*/)
  {
    return BLI_strdup(TIP_("Create object instance from object-data"));