From 4d29ec42bc9f04bbf831fc8d3b255683f498c926 Mon Sep 17 00:00:00 2001
From: Howard Trickey <howard.trickey@gmail.com>
Date: Thu, 10 Feb 2022 19:21:32 -0500
Subject: Revert "Split Python OBJ importer and exporter, enabling only the
 importer."

This reverts commit ff9dc1986e6c9a54fd0bb228e8813551e6baa042.
---
 source/blender/blenkernel/intern/blendfile.c          | 2 +-
 source/blender/blenloader/intern/versioning_userdef.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index b2ba82008ba..c32081b5d1c 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -611,12 +611,12 @@ UserDef *BKE_blendfile_userdef_from_defaults(void)
     const char *addons[] = {
         "io_anim_bvh",
         "io_curve_svg",
-        "io_import_obj",
         "io_mesh_ply",
         "io_mesh_stl",
         "io_mesh_uv_layout",
         "io_scene_fbx",
         "io_scene_gltf2",
+        "io_scene_obj",
         "io_scene_x3d",
         "cycles",
         "pose_library",
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index d1a1436f74c..8685a0fa62d 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -959,13 +959,6 @@ void blo_do_versions_userdef(UserDef *userdef)
    */
   {
     /* Keep this block, even when empty. */
-    if (!USER_VERSION_ATLEAST(301, 7)) {
-      /* io_scene_obj directory is gone, split into io_import_obj and io_export_obj,
-       * with io_import_obj enabled by default and io_export_obj replaced by the C++ version.
-       */
-      BKE_addon_remove_safe(&userdef->addons, "io_scene_obj");
-      BKE_addon_ensure(&userdef->addons, "io_import_obj");
-    }
   }
 
   LISTBASE_FOREACH (bTheme *, btheme, &userdef->themes) {
-- 
cgit v1.2.3