correct for re-arranged imports

diff --git a/io_directx_bel/__init__.py b/io_directx_bel/__init__.py
index 8ce76d1a38d33fd3c967bb86a062d10d2f9ad48e..d6bfb53d5ff8b04a4e6867a001680509886b8eb6 100644 (file)
--- a/io_directx_bel/__init__.py
+++ b/io_directx_bel/__init__.py
@@ -5,7 +5,6 @@ bl_info = {
     "author": "Littleneo (Jerome Mahieux)",
     "version": (0, 16),
     "blender": (2, 6, 1),
     "author": "Littleneo (Jerome Mahieux)",
     "version": (0, 16),
     "blender": (2, 6, 1),

-    "api": 42615,

     "location": "File > Import > DirectX (.x)",
     "warning": "",
     "wiki_url": "https://github.com/littleneo/directX_blender/wiki",
     "location": "File > Import > DirectX (.x)",
     "warning": "",
     "wiki_url": "https://github.com/littleneo/directX_blender/wiki",


@@ -33,7 +32,7 @@ from bpy_extras.io_utils import (ExportHelper,
                                  path_reference_mode,
                                  axis_conversion,
                                  )
                                  path_reference_mode,
                                  axis_conversion,
                                  )

-import bel
+

 '''
 class DisplayTree(bpy.types.Operator) :
     bl_idname = 'city.selector'
 '''
 class DisplayTree(bpy.types.Operator) :
     bl_idname = 'city.selector'


@@ -190,6 +189,7 @@ class ImportX(bpy.types.Operator, ImportHelper):
             )
 
     def execute(self, context):
             )
 
     def execute(self, context):

+        from . import bel

         from . import import_x
         if self.split_mode == 'OFF':
             self.use_split_objects = False
         from . import import_x
         if self.split_mode == 'OFF':
             self.use_split_objects = False


@@ -300,4 +300,4 @@ def unregister():
     #bpy.types.INFO_MT_file_export.remove(menu_func_export)
 
 if __name__ == "__main__":
     #bpy.types.INFO_MT_file_export.remove(menu_func_export)
 
 if __name__ == "__main__":

-    register()
\ No newline at end of file
+    register()

diff --git a/io_directx_bel/bel/image.py b/io_directx_bel/bel/image.py
index 043775aa573c73bd5baed5599d3aee44c037c4d2..cc6400a2e439f50aafddfc7809e0f5c8d1537ebc 100644 (file)
--- a/io_directx_bel/bel/image.py
+++ b/io_directx_bel/bel/image.py
@@ -1,7 +1,7 @@
 import bpy
 import bpy.path
 import bpy
 import bpy.path

-import bel
-import bel.fs
+import io_directx_bel.bel.fs
+from io_directx_bel import bel

 
 debuglevel = 0
 
 
 debuglevel = 0
 


@@ -261,4 +261,4 @@ def BSshader(nodes,pointer) :
         texslot.use_map_alpha = alpha
         texslot.alpha_factor = 1.0
 
         texslot.use_map_alpha = alpha
         texslot.alpha_factor = 1.0
 

-    return mat
\ No newline at end of file
+    return mat

diff --git a/io_directx_bel/bel/mesh.py b/io_directx_bel/bel/mesh.py
index 969525ac4eb3bf9a7b86ec4c3bd4c7f8a89e9975..c77990586ff57ae20cf47cabe68529e670463205 100644 (file)
--- a/io_directx_bel/bel/mesh.py
+++ b/io_directx_bel/bel/mesh.py
@@ -4,8 +4,9 @@ import bpy
 import mathutils
 from mathutils import *
 
 import mathutils
 from mathutils import *
 

-import bel.uv
-import bel.ob
+import io_directx_bel.bel.uv
+import io_directx_bel.bel.ob
+from io_directx_bel import bel

 
 debuglevel = 0
 '''
 
 debuglevel = 0
 '''

diff --git a/io_directx_bel/bel/uv.py b/io_directx_bel/bel/uv.py
index 1724c31fbb399e63b77069d1bffb2c64d5e039fa..6ef38f411ecba4a60ae94b460fcb969896dd4758 100644 (file)
--- a/io_directx_bel/bel/uv.py
+++ b/io_directx_bel/bel/uv.py
@@ -1,5 +1,5 @@
 from mathutils import Vector
 from mathutils import Vector

-import bel
+from .. import bel

 
 def write(me, uvs, matimage = False) :
     uvs, nest = bel.nested(uvs)
 
 def write(me, uvs, matimage = False) :
     uvs, nest = bel.nested(uvs)

diff --git a/io_directx_bel/import_x.py b/io_directx_bel/import_x.py
index 19e60b29ebcab8c9535b8b560090b99ccef32225..c6f6a504ad8e0f9a149d61b74a18c75d99dc1c6b 100644 (file)
--- a/io_directx_bel/import_x.py
+++ b/io_directx_bel/import_x.py
@@ -27,17 +27,18 @@ import struct, binascii
 import time
 
 import bpy
 import time
 
 import bpy

-import mathutils as bmat

 from mathutils import Vector, Matrix
 
 from mathutils import Vector, Matrix
 

-import bel
-import bel.mesh
-import bel.image
-import bel.uv
-import bel.material
-import bel.ob
-import bel.fs

 
 

+import io_directx_bel.bel.mesh
+import io_directx_bel.bel.image
+import io_directx_bel.bel.uv
+import io_directx_bel.bel.material
+import io_directx_bel.bel.ob
+import io_directx_bel.bel.fs
+from io_directx_bel import bel
+
+# XXX, should use explicit names

 from .templates_x import *
 
 '''
 from .templates_x import *
 
 '''