diff --git a/io_anim_bvh/__init__.py b/io_anim_bvh/__init__.py index 96e034f0949159ec9c26a99e81bde9dc539fb8e8..350297a59f212c619bd263eb5b36f5df63fcf2be 100644 --- a/io_anim_bvh/__init__.py +++ b/io_anim_bvh/__init__.py @@ -38,7 +38,7 @@ if "bpy" in locals(): import bpy -from bpy.props import * +from bpy.props import StringProperty, FloatProperty, IntProperty, BoolProperty, EnumProperty from io_utils import ImportHelper, ExportHelper diff --git a/io_anim_camera.py b/io_anim_camera.py index 592c59445560d4348076d36c085f55b1f38aa5ef..b9e0355fd1fbbed9dec5ca1015cc77cbba37e068 100644 --- a/io_anim_camera.py +++ b/io_anim_camera.py @@ -114,7 +114,7 @@ def writeCameras(context, filepath, frame_start, frame_end, only_selected=False) fw("\n") -from bpy.props import * +from bpy.props import StringProperty, IntProperty, BoolProperty from io_utils import ExportHelper diff --git a/io_curve_svg/__init__.py b/io_curve_svg/__init__.py index 66e9cac2d37eb8236e89bb09a6278bf111c9f18b..c20c69964d65cd5bee8452ee11dadf6a66ce2da8 100644 --- a/io_curve_svg/__init__.py +++ b/io_curve_svg/__init__.py @@ -42,7 +42,7 @@ if "bpy" in locals(): import bpy -from bpy.props import * +from bpy.props import StringProperty from io_utils import ImportHelper, ExportHelper diff --git a/io_import_scene_lwo.py b/io_import_scene_lwo.py index 2181cf4b0902c827eada9cfb5f6ce26c49a3e3ab..dc9aa9ac4ff80c13c83215182988032dc9d69fda 100644 --- a/io_import_scene_lwo.py +++ b/io_import_scene_lwo.py @@ -1209,7 +1209,7 @@ def build_objects(object_layers, object_surfs, object_tags, object_name, add_sub print("Done Importing LWO File") -from bpy.props import * +from bpy.props import StringProperty, BoolProperty class IMPORT_OT_lwo(bpy.types.Operator): diff --git a/io_import_scene_mhx.py b/io_import_scene_mhx.py index e4993b3e1e2861230d52d2c812b557dc70129945..3e47039089b3b5aea7bfd9a0054807682fd35c5f 100644 --- a/io_import_scene_mhx.py +++ b/io_import_scene_mhx.py @@ -66,7 +66,7 @@ import bpy import os import time import mathutils -from mathutils import * +from mathutils import Matrix #import geometry #import string @@ -2144,7 +2144,7 @@ def parseProcess(args, tokens): elif key == 'Bend': axis = val[1] angle = float(val[2]) - mat = mathutils.Matrix.Rotation(angle, 4, axis) + mat = Matrix.Rotation(angle, 4, axis) try: pb = pbones[val[0]] prod = pb.matrix_local * mat @@ -2602,8 +2602,8 @@ def writeDefaults(): # User interface # -DEBUG= False -from bpy.props import * +DEBUG = False +from bpy.props import StringProperty, FloatProperty, EnumProperty from io_utils import ImportHelper diff --git a/io_mesh_ply/__init__.py b/io_mesh_ply/__init__.py index 0249795b808e6d2723e05be3eb59c6d6d873a656..a03c7f4c9d73dd5216b52419d5efb60521c1bdf0 100644 --- a/io_mesh_ply/__init__.py +++ b/io_mesh_ply/__init__.py @@ -41,7 +41,7 @@ if "bpy" in locals(): import os import bpy -from bpy.props import * +from bpy.props import CollectionProperty, StringProperty, BoolProperty from io_utils import ImportHelper, ExportHelper diff --git a/io_mesh_stl/__init__.py b/io_mesh_stl/__init__.py index f3b925abcf7429468a6a69ec0bf2f3b04978b063..350c4e6c7900ba491dbb59a07f6df9d1e15d7c20 100644 --- a/io_mesh_stl/__init__.py +++ b/io_mesh_stl/__init__.py @@ -51,17 +51,15 @@ Import: if "bpy" in locals(): import imp - imp.reload(stl_utils) - imp.reload(blender_utils) -else: - from . import stl_utils - from . import blender_utils + if "stl_utils" in locals(): + imp.reload(stl_utils) + if "blender_utils" in locals(): + imp.reload(blender_utils) -import itertools import os import bpy -from bpy.props import * +from bpy.props import StringProperty, BoolProperty, CollectionProperty from io_utils import ExportHelper, ImportHelper @@ -82,6 +80,9 @@ class ImportSTL(bpy.types.Operator, ImportHelper): directory = StringProperty() def execute(self, context): + from . import stl_utils + from . import blender_utils + paths = [os.path.join(self.directory, name.name) for name in self.files] if not paths: @@ -114,6 +115,10 @@ class ExportSTL(bpy.types.Operator, ExportHelper): default=True) def execute(self, context): + from . import stl_utils + from . import blender_utils + import itertools + faces = itertools.chain.from_iterable( blender_utils.faces_from_mesh(ob, self.apply_modifiers) for ob in context.selected_objects) diff --git a/io_scene_3ds/__init__.py b/io_scene_3ds/__init__.py index 4840a9000fdf343c8cb4ef007a6bdd2411156985..25165f5ca3bde9b2de3b5404306d614c1daef526 100644 --- a/io_scene_3ds/__init__.py +++ b/io_scene_3ds/__init__.py @@ -40,7 +40,7 @@ if "bpy" in locals(): import bpy -from bpy.props import * +from bpy.props import StringProperty, FloatProperty, BoolProperty from io_utils import ImportHelper, ExportHelper diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py index 49f14a947e35cb6385a209ba519951522624f75f..c2da7e2d251f534a79584fe963c36577bc1ab5af 100644 --- a/io_scene_fbx/__init__.py +++ b/io_scene_fbx/__init__.py @@ -40,7 +40,7 @@ if "bpy" in locals(): import bpy -from bpy.props import * +from bpy.props import StringProperty, BoolProperty, FloatProperty from io_utils import ExportHelper diff --git a/io_scene_m3/__init__.py b/io_scene_m3/__init__.py index 088fd5a083480c30da03c429633f5ab85471f98a..fde959734644aecabdd1e529230dd66e00bb1020 100644 --- a/io_scene_m3/__init__.py +++ b/io_scene_m3/__init__.py @@ -46,7 +46,7 @@ if "bpy" in locals(): import time import datetime import bpy -from bpy.props import * +from bpy.props import StringProperty, BoolProperty from io_utils import ImportHelper, ExportHelper diff --git a/io_scene_obj/__init__.py b/io_scene_obj/__init__.py index 137c56d7d1b96f163eb879635d7adde49ffbd7ef..3c9c5b5ce5a82e9218db50f88f80151c438e2cfb 100644 --- a/io_scene_obj/__init__.py +++ b/io_scene_obj/__init__.py @@ -40,7 +40,7 @@ if "bpy" in locals(): import bpy -from bpy.props import * +from bpy.props import BoolProperty, FloatProperty, StringProperty from io_utils import ExportHelper, ImportHelper diff --git a/io_scene_x3d/__init__.py b/io_scene_x3d/__init__.py index b6ba16c8b666208723ced50c3798dfe790510dcd..3aff0e9f57bc3b9cb1e5b392c7ee8b307bff6a5a 100644 --- a/io_scene_x3d/__init__.py +++ b/io_scene_x3d/__init__.py @@ -40,7 +40,7 @@ if "bpy" in locals(): import bpy -from bpy.props import * +from bpy.props import StringProperty, BoolProperty from io_utils import ImportHelper, ExportHelper diff --git a/io_shape_mdd/__init__.py b/io_shape_mdd/__init__.py index f6e404a9badc3e960a39a6d626a3b2ac8a61ef3d..f76f7d38567a1b023fc96766aba559fc09707c60 100644 --- a/io_shape_mdd/__init__.py +++ b/io_shape_mdd/__init__.py @@ -40,7 +40,7 @@ if "bpy" in locals(): import bpy -from bpy.props import * +from bpy.props import StringProperty, IntProperty from io_utils import ExportHelper, ImportHelper diff --git a/render_povray/__init__.py b/render_povray/__init__.py index 2c54bf26f39fd40daae17ee7959314c3b95d03ec..2a94a6f344550c7a75042d74d7e3eb6139a3f934 100644 --- a/render_povray/__init__.py +++ b/render_povray/__init__.py @@ -40,7 +40,7 @@ if "bpy" in locals(): else: import bpy - from bpy.props import * + from bpy.props import StringProperty, BoolProperty, IntProperty, FloatProperty, FloatVectorProperty, EnumProperty from render_povray import ui from render_povray import render diff --git a/space_view3d_copy_attributes.py b/space_view3d_copy_attributes.py index 8b622c3d9ea78e6323c5d54345286c8ce167f576..9f96e0e398b5844ad3413f5808bed94480fca6cb 100644 --- a/space_view3d_copy_attributes.py +++ b/space_view3d_copy_attributes.py @@ -34,7 +34,7 @@ bl_info = { import bpy import mathutils -from mathutils import * +from mathutils import Matrix, Vector def build_exec(loopfunc, func):