[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2941] contrib/py/scripts/addons/ io_directx_bel: correct for re-arranged imports

[Campbell Barton]

Revision: 2941
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2941
Author:   campbellbarton
Date:     2012-01-23 16:08:35 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
correct for re-arranged imports

Modified Paths:
--------------
    contrib/py/scripts/addons/io_directx_bel/__init__.py
    contrib/py/scripts/addons/io_directx_bel/bel/image.py
    contrib/py/scripts/addons/io_directx_bel/bel/mesh.py
    contrib/py/scripts/addons/io_directx_bel/bel/uv.py
    contrib/py/scripts/addons/io_directx_bel/import_x.py

Modified: contrib/py/scripts/addons/io_directx_bel/__init__.py
===================================================================
--- contrib/py/scripts/addons/io_directx_bel/__init__.py	2012-01-23 16:02:01 UTC (rev 2940)
+++ contrib/py/scripts/addons/io_directx_bel/__init__.py	2012-01-23 16:08:35 UTC (rev 2941)
@@ -5,7 +5,6 @@
     "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",
@@ -33,7 +32,7 @@
                                  path_reference_mode,
                                  axis_conversion,
                                  )
-import bel
+
 '''
 class DisplayTree(bpy.types.Operator) :
     bl_idname = 'city.selector'
@@ -189,7 +188,8 @@
             default='Y',
             )
 
-    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
@@ -300,4 +300,4 @@
     #bpy.types.INFO_MT_file_export.remove(menu_func_export)
 
 if __name__ == "__main__":
-    register()
\ No newline at end of file
+    register()

Modified: contrib/py/scripts/addons/io_directx_bel/bel/image.py
===================================================================
--- contrib/py/scripts/addons/io_directx_bel/bel/image.py	2012-01-23 16:02:01 UTC (rev 2940)
+++ contrib/py/scripts/addons/io_directx_bel/bel/image.py	2012-01-23 16:08:35 UTC (rev 2941)
@@ -1,7 +1,7 @@
 import bpy
 import bpy.path
-import bel
-import bel.fs
+import io_directx_bel.bel.fs
+from io_directx_bel import bel
 
 debuglevel = 0
 
@@ -261,4 +261,4 @@
         texslot.use_map_alpha = alpha
         texslot.alpha_factor = 1.0
 
-    return mat
\ No newline at end of file
+    return mat

Modified: contrib/py/scripts/addons/io_directx_bel/bel/mesh.py
===================================================================
--- contrib/py/scripts/addons/io_directx_bel/bel/mesh.py	2012-01-23 16:02:01 UTC (rev 2940)
+++ contrib/py/scripts/addons/io_directx_bel/bel/mesh.py	2012-01-23 16:08:35 UTC (rev 2941)
@@ -4,8 +4,9 @@
 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
 '''

Modified: contrib/py/scripts/addons/io_directx_bel/bel/uv.py
===================================================================
--- contrib/py/scripts/addons/io_directx_bel/bel/uv.py	2012-01-23 16:02:01 UTC (rev 2940)
+++ contrib/py/scripts/addons/io_directx_bel/bel/uv.py	2012-01-23 16:08:35 UTC (rev 2941)
@@ -1,5 +1,5 @@
 from mathutils import Vector
-import bel
+from .. import bel
 
 def write(me, uvs, matimage = False) :
     uvs, nest = bel.nested(uvs)

Modified: contrib/py/scripts/addons/io_directx_bel/import_x.py
===================================================================
--- contrib/py/scripts/addons/io_directx_bel/import_x.py	2012-01-23 16:02:01 UTC (rev 2940)
+++ contrib/py/scripts/addons/io_directx_bel/import_x.py	2012-01-23 16:08:35 UTC (rev 2941)
@@ -27,17 +27,18 @@
 import time
 
 import bpy
-import mathutils as bmat
 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 *
 
 '''