update for changes in blender

5 files changed, 5 insertions, 24 deletions

diff --git a/add_mesh_BoltFactory/createMesh.py b/add_mesh_BoltFactory/createMesh.py
index 85bf26fd..a41e6994 100644
--- a/add_mesh_BoltFactory/createMesh.py
+++ b/add_mesh_BoltFactory/createMesh.py
@@ -1,23 +1,4 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-
-import os  #remove this
+import os  #remove this
 import bpy
 
 try: 
diff --git a/io_mesh_raw/import_raw.py b/io_mesh_raw/import_raw.py
index 2eea174d..6a9b3eb7 100644
--- a/io_mesh_raw/import_raw.py
+++ b/io_mesh_raw/import_raw.py
@@ -125,7 +125,7 @@ class RawImporter(bpy.types.Operator):
     def execute(self, context):
 
         #convert the filename to an object name
-        objName = bpy.utils.display_name(self.properties.filename)
+        objName = bpy.path.display_name(self.properties.filename)
 
         mesh = readMesh(self.properties.filepath, objName)
         addMeshObj(mesh, objName)
diff --git a/io_mesh_stl/__init__.py b/io_mesh_stl/__init__.py
index 04297d2c..cd1ac79f 100644
--- a/io_mesh_stl/__init__.py
+++ b/io_mesh_stl/__init__.py
@@ -77,7 +77,7 @@ class StlImporter(bpy.types.Operator):
                           default="")
 
     def execute(self, context):
-        objName = bpy.utils.display_name(self.properties.filepath.split("\\")[-1].split("/")[-1])
+        objName = bpy.path.display_name(self.properties.filepath.split("\\")[-1].split("/")[-1])
         tris, pts = stl_utils.read_stl(self.properties.filepath)
 
         blender_utils.create_and_link_mesh(objName, tris, pts)
diff --git a/io_mesh_stl/stl_utils.py b/io_mesh_stl/stl_utils.py
index 34db045c..92723e98 100644
--- a/io_mesh_stl/stl_utils.py
+++ b/io_mesh_stl/stl_utils.py
@@ -222,7 +222,7 @@ if __name__ == '__main__':
     filenames = sys.argv[sys.argv.index('--') + 1:]
 
     for filename in filenames:
-        objName = bpy.utils.display_name(filename)
+        objName = bpy.path.display_name(filename)
         tris, pts = read_stl(filename)
 
         blender_utils.create_and_link_mesh(objName, tris, pts)
diff --git a/render_povray/render.py b/render_povray/render.py
index 9b013974..c5260740 100644
--- a/render_povray/render.py
+++ b/render_povray/render.py
@@ -80,7 +80,7 @@ def write_pov(filename, scene=None, info_callback=None):
         else:
             name_orig = DEF_MAT_NAME
 
-        name = materialNames[name_orig] = uniqueName(bpy.utils.clean_name(name_orig), materialNames)
+        name = materialNames[name_orig] = uniqueName(bpy.path.clean_name(name_orig), materialNames)
 
         file.write('#declare %s = finish {\n' % name)