[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [1982] trunk/py/scripts/addons: update for changes in blenders api

[Campbell Barton]

Revision: 1982
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=1982
Author:   campbellbarton
Date:     2011-05-28 09:35:49 +0000 (Sat, 28 May 2011)
Log Message:
-----------
update for changes in blenders api

Modified Paths:
--------------
    trunk/py/scripts/addons/io_anim_bvh/export_bvh.py
    trunk/py/scripts/addons/io_import_images_as_planes.py
    trunk/py/scripts/addons/io_mesh_ply/import_ply.py
    trunk/py/scripts/addons/io_scene_3ds/import_3ds.py
    trunk/py/scripts/addons/io_scene_m3/import_m3.py
    trunk/py/scripts/addons/io_scene_obj/import_obj.py
    trunk/py/scripts/addons/io_scene_x3d/import_x3d.py

Modified: trunk/py/scripts/addons/io_anim_bvh/export_bvh.py
===================================================================
--- trunk/py/scripts/addons/io_anim_bvh/export_bvh.py	2011-05-28 04:59:10 UTC (rev 1981)
+++ trunk/py/scripts/addons/io_anim_bvh/export_bvh.py	2011-05-28 09:35:49 UTC (rev 1982)
@@ -23,8 +23,15 @@
 
 import bpy
 
-def write_armature(context, filepath, frame_start, frame_end, global_scale=1.0, rotate_mode="NATIVE"):
 
+def write_armature(context,
+                   filepath,
+                   frame_start,
+                   frame_end,
+                   global_scale=1.0,
+                   rotate_mode='NATIVE',
+                   ):
+
     def ensure_rot_order(rot_order_str):
         if set(rot_order_str) != {'X', 'Y', 'Z'}:
             rot_order_str = "XYZ"

Modified: trunk/py/scripts/addons/io_import_images_as_planes.py
===================================================================
--- trunk/py/scripts/addons/io_import_images_as_planes.py	2011-05-28 04:59:10 UTC (rev 1981)
+++ trunk/py/scripts/addons/io_import_images_as_planes.py	2011-05-28 09:35:49 UTC (rev 1982)
@@ -35,7 +35,8 @@
 import bpy, os, mathutils
 from bpy.props import *
 from add_utils import *
-from bpy_extras.io_utils import ImportHelper, load_image
+from bpy_extras.io_utils import ImportHelper
+from bpy_extras.image_utils import load_image
 
 ## GLOBAL VARS ##
 EXT_LIST = {

Modified: trunk/py/scripts/addons/io_mesh_ply/import_ply.py
===================================================================
--- trunk/py/scripts/addons/io_mesh_ply/import_ply.py	2011-05-28 04:59:10 UTC (rev 1981)
+++ trunk/py/scripts/addons/io_mesh_ply/import_ply.py	2011-05-28 09:35:49 UTC (rev 1982)
@@ -207,7 +207,8 @@
 
 def load_ply(filepath):
     import time
-    from bpy_extras.io_utils import load_image, unpack_list, unpack_face_list
+    from bpy_extras.io_utils import unpack_list, unpack_face_list
+    from bpy_extras.image_utils import load_image
 
     t = time.time()
     obj_spec, obj = read(filepath)

Modified: trunk/py/scripts/addons/io_scene_3ds/import_3ds.py
===================================================================
--- trunk/py/scripts/addons/io_scene_3ds/import_3ds.py	2011-05-28 04:59:10 UTC (rev 1981)
+++ trunk/py/scripts/addons/io_scene_3ds/import_3ds.py	2011-05-28 09:35:49 UTC (rev 1982)
@@ -25,8 +25,6 @@
 import time
 import struct
 
-from bpy_extras.io_utils import load_image
-
 import bpy
 import mathutils
 
@@ -240,6 +238,8 @@
 
 
 def process_next_chunk(file, previous_chunk, importedObjects, IMAGE_SEARCH):
+    from bpy_extras.image_utils import load_image
+
     #print previous_chunk.bytes_read, 'BYTES READ'
     contextObName = None
     contextLamp = [None, None]  # object, Data

Modified: trunk/py/scripts/addons/io_scene_m3/import_m3.py
===================================================================
--- trunk/py/scripts/addons/io_scene_m3/import_m3.py	2011-05-28 04:59:10 UTC (rev 1981)
+++ trunk/py/scripts/addons/io_scene_m3/import_m3.py	2011-05-28 09:35:49 UTC (rev 1982)
@@ -56,7 +56,7 @@
 import struct
 import os.path
 from bpy.props import *
-from bpy_extras.io_utils import load_image
+from bpy_extras.image_utils import load_image
 
 ##################
 ## Struct setup ##

Modified: trunk/py/scripts/addons/io_scene_obj/import_obj.py
===================================================================
--- trunk/py/scripts/addons/io_scene_obj/import_obj.py	2011-05-28 04:59:10 UTC (rev 1981)
+++ trunk/py/scripts/addons/io_scene_obj/import_obj.py	2011-05-28 09:35:49 UTC (rev 1982)
@@ -35,8 +35,8 @@
 import time
 import bpy
 import mathutils
-from mathutils.geometry import tesselate_polygon
-from bpy_extras.io_utils import load_image, unpack_list, unpack_face_list
+from bpy_extras.io_utils import unpack_list, unpack_face_list
+from bpy_extras.image_utils import load_image
 
 
 def line_value(line_split):

Modified: trunk/py/scripts/addons/io_scene_x3d/import_x3d.py
===================================================================
--- trunk/py/scripts/addons/io_scene_x3d/import_x3d.py	2011-05-28 04:59:10 UTC (rev 1981)
+++ trunk/py/scripts/addons/io_scene_x3d/import_x3d.py	2011-05-28 09:35:49 UTC (rev 1982)
@@ -948,7 +948,7 @@
                 urls.append(os.path.join(os.path.dirname(self.getFilename()), url))
                 urls.append(bpy.path.resolve_ncase(urls[-1]))
 
-                urls.append(os.path.join(os.path.dirname(self.getFilename()), os.path.basename(url)))  
+                urls.append(os.path.join(os.path.dirname(self.getFilename()), os.path.basename(url)))
                 urls.append(bpy.path.resolve_ncase(urls[-1]))
 
                 try: