[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10814] branches/2.44-stable/release/ scripts: Merge from "trunk", revision 10804:10805
Diego Borghetti (Plumiferos)
bdiego at gmail.com
Tue May 29 17:01:57 CEST 2007
Revision: 10814
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10814
Author: bdiego
Date: 2007-05-29 17:01:54 +0200 (Tue, 29 May 2007)
Log Message:
-----------
Merge from "trunk", revision 10804:10805
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10804
Modified Paths:
--------------
branches/2.44-stable/release/scripts/export_mdd.py
branches/2.44-stable/release/scripts/import_obj.py
branches/2.44-stable/release/scripts/slp_import.py
Modified: branches/2.44-stable/release/scripts/export_mdd.py
===================================================================
--- branches/2.44-stable/release/scripts/export_mdd.py 2007-05-29 10:28:19 UTC (rev 10813)
+++ branches/2.44-stable/release/scripts/export_mdd.py 2007-05-29 15:01:54 UTC (rev 10814)
@@ -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: branches/2.44-stable/release/scripts/import_obj.py
===================================================================
--- branches/2.44-stable/release/scripts/import_obj.py 2007-05-29 10:28:19 UTC (rev 10813)
+++ branches/2.44-stable/release/scripts/import_obj.py 2007-05-29 15:01:54 UTC (rev 10814)
@@ -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: branches/2.44-stable/release/scripts/slp_import.py
===================================================================
--- branches/2.44-stable/release/scripts/slp_import.py 2007-05-29 10:28:19 UTC (rev 10813)
+++ branches/2.44-stable/release/scripts/slp_import.py 2007-05-29 15:01:54 UTC (rev 10814)
@@ -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:])
More information about the Bf-blender-cvs
mailing list