Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / blender / blender_mesh.cpp
index 51f41e58b3b54a813d86093d4fc6853406e8f2bb..a165fc00d74358bec43e5bd9f486c424d32e2f9b 100644 (file)
@@ -547,8 +547,6 @@ static void attr_create_uv_map(Scene *scene,
 static void attr_create_subd_uv_map(Scene *scene,
                                     Mesh *mesh,
                                     BL::Mesh& b_mesh,
-                                    const vector<int>& nverts,
-                                    const vector<int>& face_flags,
                                     bool subdivide_uvs)
 {
        if(b_mesh.uv_layers.length() != 0) {
@@ -953,7 +951,7 @@ static void create_mesh(Scene *scene,
        attr_create_vertex_color(scene, mesh, b_mesh, nverts, face_flags, subdivision);
 
        if(subdivision) {
-               attr_create_subd_uv_map(scene, mesh, b_mesh, nverts, face_flags, subdivide_uvs);
+               attr_create_subd_uv_map(scene, mesh, b_mesh, subdivide_uvs);
        }
        else {
                attr_create_uv_map(scene, mesh, b_mesh, nverts, face_flags);