diff --git a/io_anim_bvh/export_bvh.py b/io_anim_bvh/export_bvh.py index 6d36e587ea5834d8bca18145ff37a78b5687eb36..851eb1cc48f0dbed4041fcae50f591f484e60b77 100644 --- a/io_anim_bvh/export_bvh.py +++ b/io_anim_bvh/export_bvh.py @@ -23,7 +23,14 @@ 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'}: diff --git a/io_import_images_as_planes.py b/io_import_images_as_planes.py index 38c8efdc3e1568c65562c643951fafb197a5ea4e..4ede9e93d5ad39b0da40fada5c69d0f5e47ca680 100644 --- a/io_import_images_as_planes.py +++ b/io_import_images_as_planes.py @@ -35,7 +35,8 @@ bl_info = { 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 = { diff --git a/io_mesh_ply/import_ply.py b/io_mesh_ply/import_ply.py index bd5250650cd43699c5e9e74494899f7c4b0cdb6c..0f1789d98a52f1555ffe8cc56bf3017a4c642676 100644 --- a/io_mesh_ply/import_ply.py +++ b/io_mesh_ply/import_ply.py @@ -207,7 +207,8 @@ import bpy 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) diff --git a/io_scene_3ds/import_3ds.py b/io_scene_3ds/import_3ds.py index 967ad2e92d7d4b512fbb013c5f46add964e2c3aa..803b8e53e8948c6e92253a4bec41ef04dbee6eec 100644 --- a/io_scene_3ds/import_3ds.py +++ b/io_scene_3ds/import_3ds.py @@ -25,8 +25,6 @@ import os import time import struct -from bpy_extras.io_utils import load_image - import bpy import mathutils @@ -240,6 +238,8 @@ def add_texture_to_material(image, texture, material, mapto): 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 diff --git a/io_scene_m3/import_m3.py b/io_scene_m3/import_m3.py index a3e42e70f5acc8efdedddad481562e63d3c97335..402128da2bdd4a5ea4e72218c41649499e95287a 100644 --- a/io_scene_m3/import_m3.py +++ b/io_scene_m3/import_m3.py @@ -56,7 +56,7 @@ import mathutils 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 ## diff --git a/io_scene_obj/import_obj.py b/io_scene_obj/import_obj.py index edc17fdad7cce0f13d4d78fd26c47a3320eb25c7..697c650865a874120126e9f1e7d1610fc4007e5e 100644 --- a/io_scene_obj/import_obj.py +++ b/io_scene_obj/import_obj.py @@ -35,8 +35,8 @@ import os 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): diff --git a/io_scene_x3d/import_x3d.py b/io_scene_x3d/import_x3d.py index 9fb40288e50a916f66a18e1ec8017b781d5d4935..d3ffbb8bcdb2cb67c1801c360974a2eb5edb6e1a 100644 --- a/io_scene_x3d/import_x3d.py +++ b/io_scene_x3d/import_x3d.py @@ -948,7 +948,7 @@ class vrmlNode(object): 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: