[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16811] trunk/blender/release/scripts: fix for 3 errors in collada exporting

[Campbell Barton]

Revision: 16811
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16811
Author:   campbellbarton
Date:     2008-09-29 06:43:51 +0200 (Mon, 29 Sep 2008)

Log Message:
-----------
fix for 3 errors in collada exporting

Modified Paths:
--------------
    trunk/blender/release/scripts/bpymodules/colladaImEx/cstartup.py
    trunk/blender/release/scripts/bpymodules/colladaImEx/translator.py
    trunk/blender/release/scripts/collada_export.py

Modified: trunk/blender/release/scripts/bpymodules/colladaImEx/cstartup.py
===================================================================
--- trunk/blender/release/scripts/bpymodules/colladaImEx/cstartup.py	2008-09-29 04:36:18 UTC (rev 16810)
+++ trunk/blender/release/scripts/bpymodules/colladaImEx/cstartup.py	2008-09-29 04:43:51 UTC (rev 16811)
@@ -323,7 +323,8 @@
 		logoImage = Blender.Image.Load(scriptsLocation + 'logo.png')
 		Blender.BGL.glEnable(Blender.BGL.GL_BLEND ) # Only needed for alpha blending images with background.
 		Blender.BGL.glBlendFunc(Blender.BGL.GL_SRC_ALPHA, Blender.BGL.GL_ONE_MINUS_SRC_ALPHA)
-		Blender.Draw.Image(logoImage, 45, size[1]-30)
+		try:		Blender.Draw.Image(logoImage, 45, size[1]-30)
+		except:		pass
 		Blender.BGL.glDisable(Blender.BGL.GL_BLEND)
 	except IOError: # image not found
 		Blender.BGL.glColor3i(0.255,0.255,0.2)

Modified: trunk/blender/release/scripts/bpymodules/colladaImEx/translator.py
===================================================================
--- trunk/blender/release/scripts/bpymodules/colladaImEx/translator.py	2008-09-29 04:36:18 UTC (rev 16810)
+++ trunk/blender/release/scripts/bpymodules/colladaImEx/translator.py	2008-09-29 04:43:51 UTC (rev 16811)
@@ -2124,7 +2124,7 @@
 			if not usePhysics:
 				return None
 
-		rbFlags = [0 for a in range(16)]
+		rbFlags = [0]*32
 		rbF = bNode.rbFlags
 		lastIndex = 0
 		# Get the bit flags.
@@ -3398,7 +3398,7 @@
 		elif bLamp.type == Blender.Lamp.Types.Sun: # Directional
 			daeTechniqueCommon = collada.DaeLight.DaeDirectional()
 		else: # area
-			daeTechniqueCommon = collada.DaeOptics.TechniqueCommon()
+			daeTechniqueCommon = collada.DaeOptics.DaeTechniqueCommon()
 
 		daeTechniqueCommon.color = bLamp.col
 		daeLight.techniqueCommon = daeTechniqueCommon

Modified: trunk/blender/release/scripts/collada_export.py
===================================================================
--- trunk/blender/release/scripts/collada_export.py	2008-09-29 04:36:18 UTC (rev 16810)
+++ trunk/blender/release/scripts/collada_export.py	2008-09-29 04:43:51 UTC (rev 16811)
@@ -2206,7 +2206,7 @@
 # --- Write mesh information to dae file ---
 def writeLight( libraryElement, light ):
     
-    lightName = light.getName( )
+    lightName = light.name
     lightID = lightName + "-Lib"
     lightType = light.getType( )
     lightFlags = light.getMode( )