Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Thompson <quornian@googlemail.com>2008-08-15 04:00:27 +0400
committerIan Thompson <quornian@googlemail.com>2008-08-15 04:00:27 +0400
commitbda3e4f8e2cfc5de09f7fce9e37acebd9ba11415 (patch)
treefee5a66971ce4ccce70150f21996f9a02f6ac7eb /release
parent4cec4803385e6ae3f73cc38a079dad847df05f33 (diff)
parentfeb5e3a688519316c02e9f2d0e0062d5d3ffa907 (diff)
Merge from trunk 16031:16122
Diffstat (limited to 'release')
-rw-r--r--release/VERSION2
-rw-r--r--release/datafiles/splash.jpgbin95515 -> 50665 bytes
-rw-r--r--release/scripts/ply_export.py7
3 files changed, 5 insertions, 4 deletions
diff --git a/release/VERSION b/release/VERSION
index e72716a7902..5d8213c95e7 100644
--- a/release/VERSION
+++ b/release/VERSION
@@ -1 +1 @@
-2.46
+2.47
diff --git a/release/datafiles/splash.jpg b/release/datafiles/splash.jpg
index 6a1bd28d509..684a12c3cbb 100644
--- a/release/datafiles/splash.jpg
+++ b/release/datafiles/splash.jpg
Binary files differ
diff --git a/release/scripts/ply_export.py b/release/scripts/ply_export.py
index cecde5a0b59..19a4a60674e 100644
--- a/release/scripts/ply_export.py
+++ b/release/scripts/ply_export.py
@@ -13,7 +13,7 @@ from Blender import Mesh, Scene, Window, sys, Image, Draw
import BPyMesh
__author__ = "Bruce Merry"
-__version__ = "0.92"
+__version__ = "0.93"
__bpydoc__ = """\
This script exports Stanford PLY files from Blender. It supports normals,
colours, and texture coordinates per face or per vertex.
@@ -37,6 +37,8 @@ Only one mesh can be exported at a time.
# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Vector rounding se we can use as keys
#
+# Updated on Aug 11, 2008 by Campbell Barton
+# - added 'comment' prefix to comments - Needed to comply with the PLY spec.
#
# Updated on Jan 1, 2007 by Gabe Ghearing
# - fixed normals so they are correctly smooth/flat
@@ -162,7 +164,7 @@ def file_callback(filename):
file.write('ply\n')
file.write('format ascii 1.0\n')
- file.write('Created by Blender3D %s - www.blender.org, source file: %s\n' % (Blender.Get('version'), Blender.Get('filename').split('/')[-1].split('\\')[-1] ))
+ file.write('comment Created by Blender3D %s - www.blender.org, source file: %s\n' % (Blender.Get('version'), Blender.Get('filename').split('/')[-1].split('\\')[-1] ))
file.write('element vertex %d\n' % len(verts))
@@ -210,7 +212,6 @@ def file_callback(filename):
if faceUV: uvcoord= rvec2d(uv[j])
elif vertexUV: uvcoord= rvec2d(v.uvco)
if vertexColors: color= col[j].r, col[j].g, col[j].b
- co = v.co
file.write('%d ' % vdict[v.index][normal, uvcoord, color])