Merge branch 'blender-v4.2-release'

scripts/startup/bl_operators/view3d.py

@@ -296,6 +296,17 @@ class VIEW3D_FH_camera_background_image(FileHandler):
         return rv3d.view_perspective == 'CAMERA'
 
 
+class VIEW3D_FH_vdb_volume(FileHandler):
+    bl_idname = "VIEW3D_FH_vdb_volume"
+    bl_label = "OpenVDB volume"
+    bl_import_operator = "OBJECT_OT_volume_import"
+    bl_file_extensions = ".vdb"
+
+    @classmethod
+    def poll_drop(cls, context):
+        return context.space_data and context.space_data.type == 'VIEW_3D'
+
+
 classes = (
     VIEW3D_OT_edit_mesh_extrude_individual_move,
     VIEW3D_OT_edit_mesh_extrude_move,
@@ -304,4 +315,5 @@ classes = (
     VIEW3D_OT_transform_gizmo_set,
     VIEW3D_FH_camera_background_image,
     VIEW3D_FH_empty_image,
+    VIEW3D_FH_vdb_volume,
 )

scripts/startup/bl_ui/node_add_menu_geometry.py

@@ -577,6 +577,7 @@ class NODE_MT_category_GEO_UTILITIES_DEPRECATED(Menu):
         layout = self.layout
         node_add_menu.add_node_type(layout, "FunctionNodeAlignEulerToVector")
         node_add_menu.add_node_type(layout, "FunctionNodeRotateEuler")
+        node_add_menu.draw_assets_for_catalog(layout, "Utilities/Deprecated")
 
 
 class NODE_MT_category_GEO_UTILITIES_FIELD(Menu):

source/blender/editors/space_node/add_menu_assets.cc

@@ -97,6 +97,8 @@ static Set<StringRef> get_builtin_menus(const int tree_type)
               "Mesh/UV",
               "Point",
               "Volume",
+              "Volume/Operations",
+              "Volume/Primitives",
               "Simulation",
               "Material",
               "Texture",
@@ -106,7 +108,9 @@ static Set<StringRef> get_builtin_menus(const int tree_type)
               "Utilities/Vector",
               "Utilities/Field",
               "Utilities/Math",
+              "Utilities/Matrix",
               "Utilities/Rotation",
+              "Utilities/Deprecated",
               "Group",
               "Layout",
               "Unassigned"};

source/blender/editors/space_view3d/space_view3d.cc

@@ -684,12 +684,6 @@ static bool view3d_ima_empty_drop_poll(bContext *C, wmDrag *drag, const wmEvent
   return false;
 }
 
-static bool view3d_volume_drop_poll(bContext * /*C*/, wmDrag *drag, const wmEvent * /*event*/)
-{
-  const eFileSel_File_Types file_type = eFileSel_File_Types(WM_drag_get_path_file_type(drag));
-  return (drag->type == WM_DRAG_PATH) && (file_type == FILE_TYPE_VOLUME);
-}
-
 static bool view3d_geometry_nodes_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event)
 {
   if (!view3d_drop_id_in_main_region_poll(C, drag, event, ID_NT)) {
@@ -966,12 +960,6 @@ static void view3d_dropboxes()
                  view3d_id_path_drop_copy,
                  WM_drag_free_imported_drag_ID,
                  nullptr);
-  WM_dropbox_add(lb,
-                 "OBJECT_OT_volume_import",
-                 view3d_volume_drop_poll,
-                 view3d_id_path_drop_copy,
-                 WM_drag_free_imported_drag_ID,
-                 nullptr);
   WM_dropbox_add(lb,
                  "OBJECT_OT_data_instance_add",
                  view3d_object_data_drop_poll,