remove xreadline, some other small updates (testing new svn)

3 files changed, 7 insertions, 7 deletions

diff --git a/release/scripts/export_mdd.py b/release/scripts/export_mdd.py
index eaf6201a04d..42a85029505 100644
--- a/release/scripts/export_mdd.py
+++ b/release/scripts/export_mdd.py
@@ -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 @@ Be sure not to use modifiers that change the number or order of verts in the mes
 #
 # ***** END GPL LICENCE BLOCK *****
 
-
+import bpy
 import Blender
 from Blender import *
 import BPyMessages
@@ -118,7 +118,7 @@ def mdd_export_ui(filepath):
 	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()
diff --git a/release/scripts/import_obj.py b/release/scripts/import_obj.py
index 8b76335f686..753d8816ff9 100644
--- a/release/scripts/import_obj.py
+++ b/release/scripts/import_obj.py
@@ -183,7 +183,7 @@ def create_materials(filepath, material_libs, unique_materials, unique_material_
 			#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 @@ def get_float_func(filepath):
 	- 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 @@ def load_obj(filepath, CLAMP_SIZE= 0.0, CREATE_FGONS= True, CREATE_SMOOTH_GROUPS
 	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()
diff --git a/release/scripts/slp_import.py b/release/scripts/slp_import.py
index 9c2458b2ba5..95f6900cf10 100644
--- a/release/scripts/slp_import.py
+++ b/release/scripts/slp_import.py
@@ -68,7 +68,7 @@ def read(filename):
 	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:])