diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-23 03:45:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-23 03:45:39 +0300 |
| commit | fc1fd2704a7b1cc448b20ed5cb596784cb764224 (patch) | |
| tree | 2b24db79955d2ac49e0d45d269cec0917a387cdc /intern/cycles/blender/blender_mesh.cpp | |
| parent | 367e61117907bb7507935251ecb7e396a4c91cbc (diff) | |
| parent | bf7e4067663cec0a3b4d3194e89a28aa62b39773 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/blender_mesh.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 51f41e58b3b..a165fc00d74 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -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); |