forked from bartvdbraak/blender
Revert "Split Python OBJ importer and exporter, enabling only the importer."
This reverts commit ff9dc1986e6c9a54fd0bb228e8813551e6baa042.
This commit is contained in:
parent
c434782e3a
commit
4d29ec42bc
@ -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)")
|
||||
|
@ -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",
|
||||
|
@ -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) {
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user