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

[Antonio Vazquez]

Commit: fb68cf70feef7a4814ff6175c58f2b2c723a26d9
Author: Antonio Vazquez
Date:   Tue Sep 28 10:10:30 2021 +0200
Branches: asset-greasepencil
https://developer.blender.org/rBfb68cf70feef7a4814ff6175c58f2b2c723a26d9

Merge branch 'master' into asset-greasepencil

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



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

diff --cc source/blender/editors/space_view3d/space_view3d.c
index 15884e09406,4bee9633ece..e861ac2e1c9
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@@ -737,14 -737,12 +742,20 @@@ static void view3d_dropboxes(void
                   view3d_id_drop_copy_with_type,
                   WM_drag_free_imported_drag_ID,
                   view3d_object_data_drop_tooltip);
+   WM_dropbox_add(lb,
+                  "VIEW3D_OT_drop_world",
+                  view3d_world_drop_poll,
+                  view3d_id_drop_copy,
+                  WM_drag_free_imported_drag_ID,
+                  NULL);
 +
 +  /* TODO(@antoniov): Change to use a temp copy using BLO_library_temp_load_id (). */
 +  WM_dropbox_add(lb,
 +                 "GPENCIL_OT_asset_import",
 +                 view3d_gpencil_drop_poll,
 +                 view3d_id_drop_copy_with_type,
 +                 WM_drag_free_imported_drag_ID,
 +                 view3d_object_data_drop_tooltip);
  }
  
  static void view3d_widgets(void)