diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-08-18 00:49:55 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-08-18 03:24:13 +0300 |
commit | e8b5e66db18c315970dfcb063bced40264841228 (patch) | |
tree | e3c95808bdfed3a8beb5d9d4313a180b38324590 /intern/cycles/render/mesh_subdivision.cpp | |
parent | 7baf93c711ad1af621b41314f59c1597fbd41ca5 (diff) |
Code cleanup to use array.data() rather than &array[0]
(Now without the build errors)
Diffstat (limited to 'intern/cycles/render/mesh_subdivision.cpp')
-rw-r--r-- | intern/cycles/render/mesh_subdivision.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/mesh_subdivision.cpp b/intern/cycles/render/mesh_subdivision.cpp index efb40efbb79..f87425f0042 100644 --- a/intern/cycles/render/mesh_subdivision.cpp +++ b/intern/cycles/render/mesh_subdivision.cpp @@ -45,7 +45,7 @@ namespace Far { setNumBaseVertices(refiner, mesh.verts.size()); setNumBaseFaces(refiner, mesh.subd_faces.size()); - ccl::Mesh::SubdFace* face = &mesh.subd_faces[0]; + const ccl::Mesh::SubdFace* face = mesh.subd_faces.data(); for(int i = 0; i < mesh.subd_faces.size(); i++, face++) { setNumBaseFaceVertices(refiner, i, face->num_corners); @@ -57,7 +57,7 @@ namespace Far { template<> bool TopologyRefinerFactory<ccl::Mesh>::assignComponentTopology(TopologyRefiner& refiner, ccl::Mesh const& mesh) { - ccl::Mesh::SubdFace* face = &mesh.subd_faces[0]; + const ccl::Mesh::SubdFace* face = mesh.subd_faces.data(); for(int i = 0; i < mesh.subd_faces.size(); i++, face++) { IndexArray face_verts = getBaseFaceVertices(refiner, i); @@ -195,7 +195,7 @@ public: verts[i].value = mesh->verts[i]; } - OsdValue<float3>* src = &verts[0]; + OsdValue<float3>* src = verts.data(); for(int i = 0; i < refiner->GetMaxLevel(); i++) { OsdValue<float3>* dest = src + refiner->GetLevel(i).GetNumVertices(); Far::PrimvarRefiner(*refiner).Interpolate(i+1, src, dest); @@ -219,7 +219,7 @@ public: attr.resize(num_refiner_verts + num_local_points); attr.flags |= ATTR_FINAL_SIZE; - char* src = &attr.buffer[0]; + char* src = attr.buffer.data(); for(int i = 0; i < refiner->GetMaxLevel(); i++) { char* dest = src + refiner->GetLevel(i).GetNumVertices() * attr.data_sizeof(); |