[Bf-blender-cvs] [4d29ec42bc9] master: Revert "Split Python OBJ importer and exporter, enabling only the importer."
Howard Trickey
noreply at git.blender.org
Fri Feb 11 01:24:13 CET 2022
Commit: 4d29ec42bc9f04bbf831fc8d3b255683f498c926
Author: Howard Trickey
Date: Thu Feb 10 19:21:32 2022 -0500
Branches: master
https://developer.blender.org/rB4d29ec42bc9f04bbf831fc8d3b255683f498c926
Revert "Split Python OBJ importer and exporter, enabling only the importer."
This reverts commit ff9dc1986e6c9a54fd0bb228e8813551e6baa042.
===================================================================
M release/scripts/startup/bl_ui/space_topbar.py
M source/blender/blenkernel/intern/blendfile.c
M source/blender/blenloader/intern/versioning_userdef.c
M tests/python/CMakeLists.txt
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 493cad6d2db..a096eff6a1f 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -465,7 +465,7 @@ class TOPBAR_MT_file_export(Menu):
bl_owner_use_filter = False
def draw(self, _context):
- self.layout.operator("wm.obj_export", text="Wavefront OBJ (.obj)")
+ self.layout.operator("wm.obj_export", text="Wavefront OBJ (.obj) - New")
if bpy.app.build_options.collada:
self.layout.operator("wm.collada_export",
text="Collada (Default) (.dae)")
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) {
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index 013825d1dd9..2ca4e27bca5 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -316,10 +316,7 @@ add_blender_test(
)
endif()
-if(FALSE)
# OBJ Export tests
-# Disabled because new C++ Obj exporter has C++ tests.
-
add_blender_test(
export_obj_cube
${TEST_SRC_DIR}/io_tests/blend_geometry/all_quads.blend
@@ -340,6 +337,8 @@ add_blender_test(
--md5=a733ae4fa4a591ea9b0912da3af042de --md5_method=FILE
)
+# disabled until updated & working
+if(FALSE)
add_blender_test(
export_obj_all_objects
${TEST_SRC_DIR}/io_tests/blend_scene/all_objects.blend
More information about the Bf-blender-cvs
mailing list