diff --git a/bimport.py b/bimport.py index cad66de..85cadbe 100644 --- a/bimport.py +++ b/bimport.py @@ -22,13 +22,24 @@ if "utils" in locals(): else: from .common import utils +try: + from io_scene_gltf2.io.imp.gltf2_io_gltf import glTFImporter, ImportError + from io_scene_gltf2.blender.imp.gltf2_blender_gltf import BlenderGlTF + from io_scene_gltf2.blender.imp.gltf2_blender_vnode import VNode, compute_vnodes + from io_scene_gltf2.blender.com.gltf2_blender_extras import set_extras + from io_scene_gltf2.blender.imp.gltf2_blender_node import BlenderNode +except (ModuleNotFoundError, ImportError): + from io_scene_gltf2.io.imp.gltf2_io_gltf import glTFImporter, ImportError + from io_scene_gltf2.blender.imp.blender_gltf import BlenderGlTF + from io_scene_gltf2.blender.imp.vnode import VNode, compute_vnodes + from io_scene_gltf2.blender.com.extras import set_extras + from io_scene_gltf2.blender.imp.node import BlenderNode + # taken from blender_git/blender/scripts/addons/io_scene_gltf2/__init__.py def get_font_faces_in_file(filepath): - from io_scene_gltf2.io.imp.gltf2_io_gltf import glTFImporter, ImportError - try: import_settings = {"import_user_extensions": []} gltf_importer = glTFImporter(filepath, import_settings) @@ -283,18 +294,6 @@ class ImportGLTF2(Operator, ConvertGLTF2_Base, ImportHelper): def unit_import(self, filename, import_settings): import time - try: - from io_scene_gltf2.io.imp.gltf2_io_gltf import glTFImporter, ImportError - from io_scene_gltf2.blender.imp.gltf2_blender_gltf import BlenderGlTF - from io_scene_gltf2.blender.imp.gltf2_blender_vnode import VNode, compute_vnodes - from io_scene_gltf2.blender.com.gltf2_blender_extras import set_extras - from io_scene_gltf2.blender.imp.gltf2_blender_node import BlenderNode - except (ModuleNotFoundError, ImportError): - from io_scene_gltf2.io.imp.blender_gltf import glTFImporter, ImportError - from io_scene_gltf2.blender.imp.blender_gltf import BlenderGlTF - from io_scene_gltf2.blender.imp.vnode import VNode, compute_vnodes - from io_scene_gltf2.blender.com.extras import set_extras - from io_scene_gltf2.blender.imp.node import BlenderNode try: gltf = glTFImporter(filename, import_settings)