From 385c11d92c34d5529e577541a080cc6dc5ac5142 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 23 Mar 2012 00:56:22 +0000 Subject: last commit broke cycles, also add BMESH_TODO's for python scripts that need upgrading. --- intern/cycles/blender/blender_mesh.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'intern') diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 4153dd31c77..a81253ebb79 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -73,10 +73,10 @@ static void create_mesh(Scene *scene, Mesh *mesh, BL::Mesh b_mesh, const vector< *N= get_float3(v->normal()); /* create faces */ - BL::Mesh::faces_iterator f; + BL::Mesh::tessfaces_iterator f; vector 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 @@ static void create_subd_mesh(Mesh *mesh, BL::Mesh b_mesh, PointerRNA *cmesh, con 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()]; -- cgit v1.2.3