X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mesh_mspgl%2Fexport_mspgl.py;h=1d7062e68eaa2d5bdca07d500a87549965b953e6;hb=8b8361a2bb9bb377f222408ec59422bd33cfd64f;hp=d54d1e38478a860c5b4619deb9d8505813f3c53f;hpb=2298b92eddff337760561b12311d1f4e82745486;p=libs%2Fgl.git

diff --git a/blender/io_mesh_mspgl/export_mspgl.py b/blender/io_mesh_mspgl/export_mspgl.py
index d54d1e38..1d7062e6 100644
--- a/blender/io_mesh_mspgl/export_mspgl.py
+++ b/blender/io_mesh_mspgl/export_mspgl.py
@@ -1,5 +1,3 @@
-# $Id: mesh_export.py 137 2010-12-05 19:22:35Z tdb $
-
 import bpy
 
 class VertexCache:
@@ -231,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)
@@ -365,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()