Adapt exporter to Blender 2.63

[libs/gl.git] / blender / io_mesh_mspgl / export_mspgl.py

diff --git a/blender/io_mesh_mspgl/export_mspgl.py b/blender/io_mesh_mspgl/export_mspgl.py
index aa02c13a3e1cd09864d9047d5204f9a8c32bb663..5a1bbe1130be97b39acaf49c067679da4798f070 100644 (file)
--- a/blender/io_mesh_mspgl/export_mspgl.py
+++ b/blender/io_mesh_mspgl/export_mspgl.py
@@ -229,7 +229,7 @@ class Exporter:
                mesh = None
                bmeshes = []
                for o in objs:
-                       bmesh = o.create_mesh(context.scene, True, "PREVIEW")
+                       bmesh = o.to_mesh(context.scene, True, "PREVIEW")
                        bmeshes.append(bmesh)
                        if not mesh:
                                mesh = Mesh(bmesh)
@@ -248,15 +248,15 @@ class Exporter:
                        mesh.generate_material_uv()
 
                texunits = []
-               if mesh.uv_textures and self.export_uv!="NONE":
+               if mesh.uv_layers and self.export_uv!="NONE":
                        if self.export_uv=="UNIT0":
                                texunits = [0]
                        else:
-                               texunits = list(range(len(mesh.uv_textures)))
+                               texunits = list(range(len(mesh.uv_layers)))
 
                        tbn_unit = 0
                        if self.tbn_vecs:
-                               uvtex_names = [u.name for u in mesh.uv_textures]
+                               uvtex_names = [u.name for u in mesh.uv_layers]
                                if self.tbn_uvtex in uvtex_names:
                                        tbn_unit = uvtex_names.index(uvtex)
                                        del texunits[tbn_unit]
@@ -293,7 +293,7 @@ class Exporter:
                fmt += "_VERTEX3"
                out_file.begin("vertices", fmt)
                normal = None
-               uvs = [None]*len(mesh.uv_textures)
+               uvs = [None]*len(mesh.uv_layers)
                tan = None
                bino = None
                for v in mesh.vertices:
@@ -363,12 +363,15 @@ class Exporter:
                                out_file.end()
                                out_file.end()
                        elif mesh.materials:
-                               m = mesh.materials[0]
+                               mat = mesh.materials[0]
                                out_file.begin("material")
-                               out_file.write("diffuse", m.R, m.G, m.B, 1.0)
-                               out_file.write("ambient", m.R*m.amb, m.G*m.amb, m.B*m.amb, 1.0)
-                               out_file.write("specular", m.specR*m.spec, m.specG*m.spec, m.specB*m.spec, 1.0)
-                               out_file.write("shininess", m.hard);
+                               diff = mat.diffuse_color
+                               out_file.write("diffuse", diff.r, diff.g, diff.b, 1.0)
+                               amb = diff*mat.ambient
+                               out_file.write("ambient", amb.r, amb.g, amb.b, 1.0)
+                               spec = mat.specular_color*mat.specular_intensity
+                               out_file.write("specular", spec.r, spec.g, spec.b, 1.0)
+                               out_file.write("shininess", mat.specular_hardness);
                                out_file.end()
                        out_file.end()
                        out_file.end()