diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-23 05:18:52 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-23 05:18:52 +0400 |
commit | e63e95789e23f672b2d55319232e391e254219fb (patch) | |
tree | b25900ebb754df4376e03c49789c6ea5a808506f /io_scene_x3d | |
parent | 5127af871d9ca8493af0c36db6d6ec3f49c42451 (diff) |
update addons enabled by default to use 'faces -> tessfaces' also grease pencil scatter and quake map export.
Diffstat (limited to 'io_scene_x3d')
-rw-r--r-- | io_scene_x3d/export_x3d.py | 8 | ||||
-rw-r--r-- | io_scene_x3d/import_x3d.py | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/io_scene_x3d/export_x3d.py b/io_scene_x3d/export_x3d.py index 8bd40659..ddc07132 100644 --- a/io_scene_x3d/export_x3d.py +++ b/io_scene_x3d/export_x3d.py @@ -526,10 +526,10 @@ def export(file, mesh_id_normals = prefix_quoted_str(mesh_id, 'normals_') # tessellation faces may not exist - if not mesh.faces and mesh.polygons: + if not mesh.tessfaces and mesh.polygons: mesh.update(calc_tessface=True) - if not mesh.faces: + if not mesh.tessfaces: return use_collnode = bool([mod for mod in obj.modifiers @@ -582,7 +582,7 @@ def export(file, # fast access! mesh_vertices = mesh.vertices[:] - mesh_faces = mesh.faces[:] + mesh_faces = mesh.tessfaces[:] mesh_faces_materials = [f.material_index for f in mesh_faces] mesh_faces_vertices = [f.vertices[:] for f in mesh_faces] @@ -750,7 +750,7 @@ def export(file, # build a mesh mapping dict vertex_hash = [{} for i in range(len(mesh.vertices))] # worst case every face is a quad - face_tri_list = [[None, None, None] for i in range(len(mesh.faces) * 2)] + face_tri_list = [[None, None, None] for i in range(len(mesh.tessfaces) * 2)] vert_tri_list = [] totvert = 0 totface = 0 diff --git a/io_scene_x3d/import_x3d.py b/io_scene_x3d/import_x3d.py index 38cd5a05..f25cf38c 100644 --- a/io_scene_x3d/import_x3d.py +++ b/io_scene_x3d/import_x3d.py @@ -1667,17 +1667,17 @@ def importMesh_IndexedFaceSet(geom, bpyima, ancestry): # print(len(ifs_points), faces, edges, ngons) try: - bpymesh.faces.add(len(faces)) - bpymesh.faces.foreach_set("vertices_raw", [a for f in faces for a in (f + [0] if len(f) == 3 else f)]) # XXX25 speed + bpymesh.tessfaces.add(len(faces)) + bpymesh.tessfaces.foreach_set("vertices_raw", [a for f in faces for a in (f + [0] if len(f) == 3 else f)]) # XXX25 speed except KeyError: print("one or more vert indices out of range. corrupt file?") #for f in faces: - # bpymesh.faces.extend(faces, smooth=True) + # bpymesh.tessfaces.extend(faces, smooth=True) bpymesh.validate() # bpymesh.update() # cant call now, because it would convert tessface - if len(bpymesh.faces) != len(faces): + if len(bpymesh.tessfaces) != len(faces): print('\tWarning: adding faces did not work! file is invalid, not adding UVs or vcolors') return bpymesh, ccw @@ -1700,7 +1700,7 @@ def importMesh_IndexedFaceSet(geom, bpyima, ancestry): print('\tWarning: UV Index out of range') f.uv[j] = ifs_texpoints[0] # XXX25, speedup - elif bpyima and len(bpymesh.faces): + elif bpyima and len(bpymesh.tessfaces): # Oh Bugger! - we cant really use blenders ORCO for for texture space since texspace dosnt rotate. # we have to create VRML's coords as UVs instead. @@ -1768,7 +1768,7 @@ def importMesh_IndexedFaceSet(geom, bpyima, ancestry): depth_v = depth_u = max(depth_v, depth_u) bpymesh_vertices = bpymesh.vertices[:] - bpymesh_faces = bpymesh.faces[:] + bpymesh_faces = bpymesh.tessfaces[:] for j, f in enumerate(uvlay.data): f.image = bpyima @@ -1785,7 +1785,7 @@ def importMesh_IndexedFaceSet(geom, bpyima, ancestry): collay = bpymesh.tessface_vertex_colors.new() for f_idx, f in enumerate(collay.data): - fv = bpymesh.faces[f_idx].vertices[:] + fv = bpymesh.tessfaces[f_idx].vertices[:] if len(fv) == 3: # XXX speed fcol = f.color1, f.color2, f.color3 else: @@ -1963,7 +1963,7 @@ def importMesh_Cylinder(geom, ancestry): if not side: # remove all quads # XXX25 - # bpymesh.faces.delete(1, [f for f in bpymesh.faces if len(f) == 4]) + # bpymesh.tessfaces.delete(1, [f for f in bpymesh.tessfaces if len(f) == 4]) pass return bpymesh |