[Bf-blender-cvs] [182f57d466e] asset-lite-greasepencil: Merge branch 'master' into asset-lite-greasepencil

[Antonio Vazquez]

Commit: 182f57d466e8da79cfbef3f394bb0b02748a5d54
Author: Antonio Vazquez
Date:   Wed Oct 5 08:55:09 2022 +0200
Branches: asset-lite-greasepencil
https://developer.blender.org/rB182f57d466e8da79cfbef3f394bb0b02748a5d54

Merge branch 'master' into asset-lite-greasepencil

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

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



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

diff --cc source/blender/editors/space_view3d/space_view3d.cc
index c3eeb107f91,672922ac3e5..ff7ba020700
--- a/source/blender/editors/space_view3d/space_view3d.cc
+++ b/source/blender/editors/space_view3d/space_view3d.cc
@@@ -629,15 -629,10 +629,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),
+ static char *view3d_object_data_drop_tooltip(bContext * /*C*/,
+                                              wmDrag * /*drag*/,
                                               const int UNUSED(xy[2]),
-                                              wmDropBox *UNUSED(drop))
+                                              wmDropBox * /*drop*/)
  {
    return BLI_strdup(TIP_("Create object instance from object-data"));
  }