[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17136] trunk/blender/release/scripts: py 2.3 compat for lightwave_import and wizard_curve2tree

Campbell Barton ideasman42 at gmail.com
Tue Oct 21 02:21:02 CEST 2008


Revision: 17136
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17136
Author:   campbellbarton
Date:     2008-10-21 02:21:02 +0200 (Tue, 21 Oct 2008)

Log Message:
-----------
py 2.3 compat for lightwave_import and wizard_curve2tree

Modified Paths:
--------------
    trunk/blender/release/scripts/export_obj.py
    trunk/blender/release/scripts/lightwave_import.py
    trunk/blender/release/scripts/wizard_curve2tree.py

Modified: trunk/blender/release/scripts/export_obj.py
===================================================================
--- trunk/blender/release/scripts/export_obj.py	2008-10-20 23:21:01 UTC (rev 17135)
+++ trunk/blender/release/scripts/export_obj.py	2008-10-21 00:21:02 UTC (rev 17136)
@@ -678,7 +678,7 @@
 			
 			Draw.Label('Blender Objects as OBJ:', ui_x+9, ui_y+59, 220, 20)
 			Draw.BeginAlign()
-			EXPORT_BLEN_OBS = Draw.Toggle('Objects', EVENT_REDRAW, ui_x+9, ui_y+40, 60, 20, EXPORT_BLEN_OBS.val, 'Export blender objects as "OBJ objects".', do_split)
+			EXPORT_BLEN_OBS = Draw.Toggle('Objects', EVENT_REDRAW, ui_x+9, ui_y+39, 60, 20, EXPORT_BLEN_OBS.val, 'Export blender objects as "OBJ objects".', do_split)
 			EXPORT_GROUP_BY_OB = Draw.Toggle('Groups', EVENT_REDRAW, ui_x+69, ui_y+39, 60, 20, EXPORT_GROUP_BY_OB.val, 'Export blender objects as "OBJ Groups".', do_split)
 			EXPORT_GROUP_BY_MAT = Draw.Toggle('Material Groups', EVENT_REDRAW, ui_x+129, ui_y+39, 100, 20, EXPORT_GROUP_BY_MAT.val, 'Group by materials.', do_split)
 			Draw.EndAlign()

Modified: trunk/blender/release/scripts/lightwave_import.py
===================================================================
--- trunk/blender/release/scripts/lightwave_import.py	2008-10-20 23:21:01 UTC (rev 17135)
+++ trunk/blender/release/scripts/lightwave_import.py	2008-10-21 00:21:02 UTC (rev 17136)
@@ -106,6 +106,12 @@
 except:
 	struct= chunk= cStringIO= None
 
+# python 2.3 has no reversed() iterator. this will only work on lists and tuples
+try:
+	reversed
+except:
+	def reversed(l): return l[::-1]
+
 ### # Debuggin disabled in release.
 ### # do a search replace to enabe debug prints
 ### DEBUG = False

Modified: trunk/blender/release/scripts/wizard_curve2tree.py
===================================================================
--- trunk/blender/release/scripts/wizard_curve2tree.py	2008-10-20 23:21:01 UTC (rev 17135)
+++ trunk/blender/release/scripts/wizard_curve2tree.py	2008-10-21 00:21:02 UTC (rev 17136)
@@ -266,7 +266,9 @@
 				brch.calcData()
 			
 		# Sort from big to small, so big branches get priority
-		self.branches_all.sort( key = lambda brch: -brch.bpoints[0].radius )
+		# Py 2.3 dosnt have keywords in sort
+		try:	self.branches_all.sort( key = lambda brch: -brch.bpoints[0].radius )
+		except: self.branches_all.sort( lambda brch_a, brch_b: cmp(brch_b.bpoints[0].radius, brch_a.bpoints[0].radius) )
 	
 	
 	def closestBranchPt(self, co):





More information about the Bf-blender-cvs mailing list