[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10805] trunk/blender/release/scripts: remove xreadline, some other small updates (testing new svn)

[Campbell Barton]

Revision: 10805
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10805
Author:   campbellbarton
Date:     2007-05-29 06:15:45 +0200 (Tue, 29 May 2007)

Log Message:
-----------
remove xreadline, some other small updates (testing new svn)

Modified Paths:
--------------
    trunk/blender/release/scripts/export_mdd.py
    trunk/blender/release/scripts/import_obj.py
    trunk/blender/release/scripts/slp_import.py

Modified: trunk/blender/release/scripts/export_mdd.py
===================================================================
--- trunk/blender/release/scripts/export_mdd.py	2007-05-29 02:40:22 UTC (rev 10804)
+++ trunk/blender/release/scripts/export_mdd.py	2007-05-29 04:15:45 UTC (rev 10805)
@@ -1,7 +1,7 @@
 #!BPY
 
 """
- Name: 'Save Mesh as MDD'
+ Name: 'Vertex Keyframe Animation (.mdd)...'
  Blender: 242
  Group: 'Export'
  Tooltip: 'Animated mesh to MDD vertex keyframe file.'
@@ -36,7 +36,7 @@
 #
 # ***** END GPL LICENCE BLOCK *****
 
-
+import bpy
 import Blender
 from Blender import *
 import BPyMessages
@@ -118,7 +118,7 @@
 	if not BPyMessages.Warning_SaveOver(filepath):
 		return
 	
-	scn= Scene.GetCurrent()
+	scn= bpy.data.scenes.active
 	ob_act= scn.objects.active
 	if not ob_act or ob_act.type != 'Mesh':
 		BPyMessages.Error_NoMeshActive()

Modified: trunk/blender/release/scripts/import_obj.py
===================================================================
--- trunk/blender/release/scripts/import_obj.py	2007-05-29 02:40:22 UTC (rev 10804)
+++ trunk/blender/release/scripts/import_obj.py	2007-05-29 04:15:45 UTC (rev 10805)
@@ -183,7 +183,7 @@
 			#print '\t\tloading mtl: "%s"' % mtlpath
 			context_material= None
 			mtl= open(mtlpath)
-			for line in mtl.xreadlines():
+			for line in mtl: #.xreadlines():
 				if line.startswith('newmtl'):
 					context_material_name= line_value(line.split())
 					if unique_materials.has_key(context_material_name):
@@ -536,7 +536,7 @@
 	- weather to replace commas or not
 	'''
 	file= open(filepath, 'r')
-	for line in file.xreadlines():
+	for line in file: #.xreadlines():
 		if line.startswith('v'): # vn vt v 
 			if ',' in line:
 				return lambda f: float(f.replace(',', '.'))
@@ -586,7 +586,7 @@
 	print '\tpassing obj file "%s"...' % filepath,
 	time_sub= sys.time()
 	file= open(filepath, 'r')
-	for line in file.xreadlines():
+	for line in file: #.xreadlines():
 		
 		if line.startswith('v '):
 			line_split= line.split()

Modified: trunk/blender/release/scripts/slp_import.py
===================================================================
--- trunk/blender/release/scripts/slp_import.py	2007-05-29 02:40:22 UTC (rev 10804)
+++ trunk/blender/release/scripts/slp_import.py	2007-05-29 04:15:45 UTC (rev 10805)
@@ -68,7 +68,7 @@
 	file = open(filename, "rb")
 
 	raw = []
-	for line in file.xreadlines():
+	for line in file: #.xreadlines():
 		data = line.split()
 		if data[0] == "vertex":
 			vert = map(float, data[1:])