Revision: 21294
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21294
Author: campbellbarton
Date: 2009-07-01 23:26:23 +0200 (Wed, 01 Jul 2009)
Log Message:
-----------
exporting collada files with an empty material slot would raise a python error.
Modified Paths:
--------------
trunk/blender/release/scripts/bpymodules/colladaImEx/translator.py
trunk/blender/release/scripts/collada_export.py
Modified: trunk/blender/release/scripts/bpymodules/colladaImEx/translator.py
===================================================================
--- trunk/blender/release/scripts/bpymodules/colladaImEx/translator.py
2009-07-01 20:55:32 UTC (rev 21293)
+++ trunk/blender/release/scripts/bpymodules/colladaImEx/translator.py
2009-07-01 21:26:23 UTC (rev 21294)
@@ -3065,7 +3065,7 @@
for k, daePolygons in daePolygonsDict.iteritems():
if k != -1:
if not useUV and not mesh.materials is None and
len(mesh.materials) > 0 and k >= 0:
- daePolygons.material =
mesh.materials[k].name
+ daePolygons.material =
getattr(mesh.materials[k], 'name', "")
elif mesh.faceUV and (useUV or mesh.materials
is None or len(mesh.materials) == 0):
daePolygons.material = uvTextures[k]
offsetCount = 0
Modified: trunk/blender/release/scripts/collada_export.py
===================================================================
--- trunk/blender/release/scripts/collada_export.py 2009-07-01 20:55:32 UTC
(rev 21293)
+++ trunk/blender/release/scripts/collada_export.py 2009-07-01 21:26:23 UTC
(rev 21294)
@@ -3248,6 +3248,9 @@
Window.DrawProgressBar( progress, "Exporting geometry %.0f
%%..." % ( progress * 100.0 ) )
meshMaterials = rawMesh.getMaterials( -1 )
for material in meshMaterials:
+ if material==None:
+ continue
+
key = material.getName( )
materials[ key ] = material
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
