[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3836] tags/2_64a_release/py/scripts/ addons: merging sticky fix

Campbell Barton ideasman42 at gmail.com
Mon Oct 8 23:04:44 CEST 2012


Revision: 3836
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3836
Author:   campbellbarton
Date:     2012-10-08 21:04:44 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
merging sticky fix
svn merge ^/trunk/py/scripts/addons -c3834 .

Modified Paths:
--------------
    tags/2_64a_release/py/scripts/addons/io_mesh_ply/export_ply.py
    tags/2_64a_release/py/scripts/addons/io_scene_3ds/export_3ds.py

Property Changed:
----------------
    tags/2_64a_release/py/scripts/addons/


Property changes on: tags/2_64a_release/py/scripts/addons
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/py/scripts/addons:3834

Modified: tags/2_64a_release/py/scripts/addons/io_mesh_ply/export_ply.py
===================================================================
--- tags/2_64a_release/py/scripts/addons/io_mesh_ply/export_ply.py	2012-10-08 20:50:06 UTC (rev 3835)
+++ tags/2_64a_release/py/scripts/addons/io_mesh_ply/export_ply.py	2012-10-08 21:04:44 UTC (rev 3836)
@@ -70,16 +70,15 @@
         mesh.calc_tessface()
 
     has_uv = (len(mesh.tessface_uv_textures) > 0)
-    has_uv_vertex = (len(mesh.sticky) > 0)
     has_vcol = len(mesh.tessface_vertex_colors) > 0
 
-    if (not has_uv) and (not has_uv_vertex):
+    if not has_uv:
         use_uv_coords = False
     if not has_vcol:
         use_colors = False
 
     if not use_uv_coords:
-        has_uv = has_uv_vertex = False
+        has_uv = False
     if not use_colors:
         has_vcol = False
 
@@ -135,9 +134,6 @@
             if has_uv:
                 uvcoord = uv[j][0], uv[j][1]
                 uvcoord_key = rvec2d(uvcoord)
-            elif has_uv_vertex:
-                uvcoord = v.uvco[0], v.uvco[1]
-                uvcoord_key = rvec2d(uvcoord)
 
             if has_vcol:
                 color = col[j]

Modified: tags/2_64a_release/py/scripts/addons/io_scene_3ds/export_3ds.py
===================================================================
--- tags/2_64a_release/py/scripts/addons/io_scene_3ds/export_3ds.py	2012-10-08 20:50:06 UTC (rev 3835)
+++ tags/2_64a_release/py/scripts/addons/io_scene_3ds/export_3ds.py	2012-10-08 21:04:44 UTC (rev 3836)
@@ -831,14 +831,8 @@
         vert_array = _3ds_array()
         for vert in mesh.vertices:
             vert_array.add(_3ds_point_3d(vert.co))
-        # If the mesh has vertex UVs, create an array of UVs:
-        if mesh.sticky:
-            uv_array = _3ds_array()
-            for uv in mesh.sticky:
-                uv_array.add(_3ds_point_uv(uv.co))
-        else:
-            # no UV at all:
-            uv_array = None
+        # no UV at all:
+        uv_array = None
 
     # create the chunk:
     mesh_chunk = _3ds_chunk(OBJECT_MESH)



More information about the Bf-extensions-cvs mailing list