[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45095] trunk/blender: last commit broke cycles, also add BMESH_TODO' s for python scripts that need upgrading.

[Campbell Barton]

Revision: 45095
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45095
Author:   campbellbarton
Date:     2012-03-23 00:56:22 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
last commit broke cycles, also add BMESH_TODO's for python scripts that need upgrading.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_mesh.cpp
    trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
    trunk/blender/release/scripts/startup/bl_operators/clip.py
    trunk/blender/release/scripts/startup/bl_operators/mesh.py
    trunk/blender/release/scripts/startup/bl_operators/object.py

Modified: trunk/blender/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_mesh.cpp	2012-03-23 00:28:29 UTC (rev 45094)
+++ trunk/blender/intern/cycles/blender/blender_mesh.cpp	2012-03-23 00:56:22 UTC (rev 45095)
@@ -73,10 +73,10 @@
 		*N= get_float3(v->normal());
 
 	/* create faces */
-	BL::Mesh::faces_iterator f;
+	BL::Mesh::tessfaces_iterator f;
 	vector<int> nverts;
 
-	for(b_mesh.faces.begin(f); f != b_mesh.faces.end(); ++f) {
+	for(b_mesh.tessfaces.begin(f); f != b_mesh.tessfaces.end(); ++f) {
 		int4 vi = get_int4(f->vertices_raw());
 		int n = (vi[3] == 0)? 3: 4;
 		int mi = clamp(f->material_index(), 0, used_shaders.size()-1);
@@ -196,9 +196,9 @@
 		sdmesh.add_vert(get_float3(v->co()));
 
 	/* create faces */
-	BL::Mesh::faces_iterator f;
+	BL::Mesh::tessfaces_iterator f;
 
-	for(b_mesh.faces.begin(f); f != b_mesh.faces.end(); ++f) {
+	for(b_mesh.tessfaces.begin(f); f != b_mesh.tessfaces.end(); ++f) {
 		int4 vi = get_int4(f->vertices_raw());
 		int n= (vi[3] == 0)? 3: 4;
 		//int shader = used_shaders[f->material_index()];

Modified: trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py	2012-03-23 00:28:29 UTC (rev 45094)
+++ trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py	2012-03-23 00:56:22 UTC (rev 45095)
@@ -147,6 +147,8 @@
         mesh = bpy.data.meshes.new("Torus")
 
         mesh.vertices.add(len(verts_loc) // 3)
+        
+        # BMESH_TODO, use polygons
         mesh.faces.add(len(faces) // 4)
 
         mesh.vertices.foreach_set("co", verts_loc)

Modified: trunk/blender/release/scripts/startup/bl_operators/clip.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/clip.py	2012-03-23 00:28:29 UTC (rev 45094)
+++ trunk/blender/release/scripts/startup/bl_operators/clip.py	2012-03-23 00:56:22 UTC (rev 45095)
@@ -716,6 +716,7 @@
         mesh.vertices.add(len(vertices))
         mesh.vertices.foreach_set("co", unpack_list(vertices))
 
+        # BMESH_TODO - use polygons
         mesh.faces.add(len(faces))
         mesh.faces.foreach_set("vertices_raw", unpack_face_list(faces))
 

Modified: trunk/blender/release/scripts/startup/bl_operators/mesh.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/mesh.py	2012-03-23 00:28:29 UTC (rev 45094)
+++ trunk/blender/release/scripts/startup/bl_operators/mesh.py	2012-03-23 00:56:22 UTC (rev 45095)
@@ -82,6 +82,7 @@
                     for uv in fuvs]
 
         # as a list
+        # BMESH_TODO - use polygons
         faces = mesh.faces[:]
 
         fuvsel = [(False not in uv.select_uv) for uv in active_uv_layer]

Modified: trunk/blender/release/scripts/startup/bl_operators/object.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/object.py	2012-03-23 00:28:29 UTC (rev 45094)
+++ trunk/blender/release/scripts/startup/bl_operators/object.py	2012-03-23 00:56:22 UTC (rev 45095)
@@ -367,6 +367,7 @@
                                     (orig_shape_coords[i] - orig_coords[i]))
 
             elif mode == 'RELATIVE_FACE':
+                # BMESH TODO - use .polygons
                 for face in me.faces:
                     i1, i2, i3, i4 = face.vertices_raw
                     if i4 != 0:
@@ -539,6 +540,7 @@
                         "Object: %s, Mesh: '%s' has no UVs"
                         % (obj.name, mesh.name))
         else:
+            # BMESH_TODO - use polygons
             len_faces = len(mesh.faces)
 
             # seems to be the fastest way to create an array