source/blender/windowmanager/WM_api.hh

@@ -1426,12 +1426,26 @@ const char *WM_drag_get_item_name(wmDrag *drag);
  * may be destructed.
  */
 wmDragPath *WM_drag_create_path_data(blender::Span<const char *> paths);
+/* If #drag contains path data, returns the first path int he path list. */
 const char *WM_drag_get_single_path(const wmDrag *drag);
+/* If #drag contains path data, returns the first path in the path list that maches a
+ * a `file_type`.*/
+/*
+ * \param drag: The drag that could contain drag path data.
+ * \param file_type: `eFileSel_File_Types` bit flag
+ */
+const char *WM_drag_get_single_path(const wmDrag *drag, int file_type);
 blender::Span<std::string> WM_drag_get_paths(const wmDrag *drag);
+/* If #drag contains path data, returns if any file path match a `file_type`.*/
+/*
+ * \param drag: The drag that could contain drag path data.
+ * \param file_type: `eFileSel_File_Types` bit flag
+ */
+bool WM_drag_has_path_file_type(const wmDrag *drag, int file_type);
 /**
  * Note that even though the enum return type uses bit-flags, this should never have multiple
- * type-bits set, so `ELEM()` like comparison is possible. Only indicates the file type of first
- * path in `wmDragPath.paths`.
+ * type-bits set, so `ELEM()` like comparison is possible. To check all paths or to do a bit-flag
+ * check use `WM_drag_has_path_file_type(drag,file_type)` instead.
  */
 int /* eFileSel_File_Types */ WM_drag_get_path_file_type(const wmDrag *drag);
 

source/blender/windowmanager/WM_types.hh

@@ -1174,10 +1174,10 @@ struct wmDragAssetListItem {
 
 struct wmDragPath {
   blender::Vector<std::string> paths;
-  /* Note that even though the enum type uses bit-flags, this should never have multiple type-bits
-   * set, so `ELEM()` like comparison is possible. Only indicates the file type of first path in
-   * `wmDragPath.paths`. */
-  int file_type; /* eFileSel_File_Types */
+  /* File type of each path in #paths. */
+  blender::Vector<int> file_types; /* eFileSel_File_Types */
+  /* Bit flag of file types in #paths. */
+  int file_types_bit_flag; /* eFileSel_File_Types */
   std::string tooltip;
 };
 

source/blender/windowmanager/intern/wm_dragdrop.cc

@@ -768,10 +768,10 @@ wmDragPath *WM_drag_create_path_data(blender::Span<const char *> paths)
   BLI_assert(!paths.is_empty());
   wmDragPath *path_data = MEM_new<wmDragPath>("wmDragPath");
 
-  path_data->file_type = ED_path_extension_type(paths[0]);
-
   for (const char *path : paths) {
     path_data->paths.append(path);
+    path_data->file_types_bit_flag |= ED_path_extension_type(path);
+    path_data->file_types.append(ED_path_extension_type(path));
   }
 
   path_data->tooltip = path_data->paths[0];
@@ -800,6 +800,35 @@ const char *WM_drag_get_single_path(const wmDrag *drag)
   return path_data->paths[0].c_str();
 }
 
+const char *WM_drag_get_single_path(const wmDrag *drag, int file_type)
+{
+  if (drag->type != WM_DRAG_PATH) {
+    return nullptr;
+  }
+  const wmDragPath *path_data = static_cast<const wmDragPath *>(drag->poin);
+  auto const file_types = path_data->file_types;
+
+  auto itr = std::find_if(
+      file_types.begin(), file_types.end(), [file_type](const int file_fype_test) {
+        return file_fype_test & file_type;
+      });
+
+  if (itr == file_types.end()) {
+    return nullptr;
+  }
+  const int index = itr - file_types.begin();
+  return path_data->paths[index].c_str();
+}
+
+bool WM_drag_has_path_file_type(const wmDrag *drag, int file_type)
+{
+  if (drag->type != WM_DRAG_PATH) {
+    return false;
+  }
+  const wmDragPath *path_data = static_cast<const wmDragPath *>(drag->poin);
+  return bool(path_data->file_types_bit_flag & file_type);
+}
+
 blender::Span<std::string> WM_drag_get_paths(const wmDrag *drag)
 {
   if (drag->type != WM_DRAG_PATH) {
@@ -817,7 +846,7 @@ int WM_drag_get_path_file_type(const wmDrag *drag)
   }
 
   const wmDragPath *path_data = static_cast<const wmDragPath *>(drag->poin);
-  return path_data->file_type;
+  return path_data->file_types[0];
 }
 
 /* ************** draw ***************** */

source/blender/windowmanager/intern/wm_dragdrop_test.cc

@@ -4,9 +4,6 @@
 
 #include "testing/testing.h"
 
-/* #bContextStore. */
-#include "BKE_context.h"
-
 /* #eFileSel_File_Types. */
 #include "DNA_space_types.h"
 
@@ -38,7 +35,11 @@ TEST(wm_drag, wmDragPath)
     EXPECT_STREQ(WM_drag_get_single_path(&drag), "text_file.txt");
     EXPECT_EQ(WM_drag_get_path_file_type(&drag), FILE_TYPE_TEXT);
     EXPECT_EQ(WM_drag_get_paths(&drag), expected_file_paths.as_span());
-
+    EXPECT_STREQ(WM_drag_get_single_path(&drag, FILE_TYPE_TEXT), "text_file.txt");
+    EXPECT_EQ(WM_drag_get_single_path(&drag, FILE_TYPE_BLENDER), nullptr);
+    EXPECT_TRUE(
+        WM_drag_has_path_file_type(&drag, FILE_TYPE_BLENDER | FILE_TYPE_TEXT | FILE_TYPE_IMAGE));
+    EXPECT_FALSE(WM_drag_has_path_file_type(&drag, FILE_TYPE_BLENDER | FILE_TYPE_IMAGE));
     MEM_delete(path_data);
   }
   {
@@ -58,7 +59,20 @@ TEST(wm_drag, wmDragPath)
     EXPECT_STREQ(WM_drag_get_single_path(&drag), "blender.blend");
     EXPECT_EQ(WM_drag_get_path_file_type(&drag), FILE_TYPE_BLENDER);
     EXPECT_EQ(WM_drag_get_paths(&drag), expected_file_paths.as_span());
-
+    EXPECT_STREQ(WM_drag_get_single_path(&drag, FILE_TYPE_BLENDER), "blender.blend");
+    EXPECT_STREQ(WM_drag_get_single_path(&drag, FILE_TYPE_IMAGE), "image.png");
+    EXPECT_STREQ(WM_drag_get_single_path(&drag, FILE_TYPE_TEXT), "text_file.txt");
+    EXPECT_STREQ(
+        WM_drag_get_single_path(&drag, FILE_TYPE_BLENDER | FILE_TYPE_TEXT | FILE_TYPE_IMAGE),
+        "blender.blend");
+    EXPECT_STREQ(WM_drag_get_single_path(&drag, FILE_TYPE_TEXT | FILE_TYPE_IMAGE),
+                 "text_file.txt");
+    EXPECT_EQ(WM_drag_get_single_path(&drag, FILE_TYPE_ASSET), nullptr);
+    EXPECT_TRUE(
+        WM_drag_has_path_file_type(&drag, FILE_TYPE_BLENDER | FILE_TYPE_TEXT | FILE_TYPE_IMAGE));
+    EXPECT_TRUE(WM_drag_has_path_file_type(&drag, FILE_TYPE_BLENDER | FILE_TYPE_IMAGE));
+    EXPECT_TRUE(WM_drag_has_path_file_type(&drag, FILE_TYPE_IMAGE));
+    EXPECT_FALSE(WM_drag_has_path_file_type(&drag, FILE_TYPE_ASSET));
     MEM_delete(path_data);
   }
   {
@@ -68,6 +82,11 @@ TEST(wm_drag, wmDragPath)
     EXPECT_EQ(WM_drag_get_single_path(&drag), nullptr);
     EXPECT_EQ(WM_drag_get_path_file_type(&drag), 0);
     EXPECT_EQ(WM_drag_get_paths(&drag).size(), 0);
+    EXPECT_EQ(WM_drag_get_single_path(
+                  &drag, FILE_TYPE_BLENDER | FILE_TYPE_IMAGE | FILE_TYPE_TEXT | FILE_TYPE_ASSET),
+              nullptr);
+    EXPECT_FALSE(WM_drag_has_path_file_type(
+        &drag, FILE_TYPE_BLENDER | FILE_TYPE_IMAGE | FILE_TYPE_TEXT | FILE_TYPE_ASSET));
   }
 }