Merge branch 'blender-v4.2-release'

scripts/addons_core/bl_pkg/bl_extension_ui.py

@@ -454,6 +454,9 @@ def extensions_panel_draw_missing_with_extension_impl(
     del repo
 
     for addon_module_name in sorted(missing_modules):
+        # The `addon_pkg_id` may be an empty string, this signifies that it's not mapped to an extension.
+        # The only reason to include it at all to avoid confusion because this *was* a previously built-in
+        # add-on and this panel is titled "Built-in Add-ons".
         addon_pkg_id, addon_name = extensions_map_from_legacy_addons[addon_module_name]
 
         boxsub = box.column().box()
@@ -468,7 +471,7 @@ def extensions_panel_draw_missing_with_extension_impl(
         row_right = row.row()
         row_right.alignment = 'RIGHT'
 
-        if repo_index != -1:
+        if repo_index != -1 and addon_pkg_id:
             # NOTE: it's possible this extension is already installed.
             # the user could have installed it manually, then opened this popup.
             # This is enough of a corner case that it's not especially worth detecting

scripts/addons_core/bl_pkg/extensions_map_from_legacy_addons.py

@@ -91,5 +91,12 @@
         "system_demo_mode": ("demo_mode", "Demo Mode"),
         "system_property_chart": ("property_chart", "Property Chart"),
         "vdm_brush_baker": ("vdm_brush_baker", "VDM Brush Baker"),
+
+        # These were built-in but not mapped to an extension ("install" won't be shown in the UI).
+        "coat_applink": ("", "3D-Coat Applink"),  # External dependencies.
+        "depsgraph_debug": ("", "Dependency Graph Debug"),  # External dependencies.
+        "io_import_images_as_planes": ("", "Import Images as Planes"),  # Integrated with Blender.
+        "io_mesh_stl": ("", "STL Format"),  # Was on by default.
+        "io_scene_x3d": ("", "Web3D X3D/VRML2 format"),  # Was on by default.
     },
 }