diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-10 08:51:52 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-10 08:51:52 +0300 |
| commit | 8a76f8dac3475b1d24956e0d384d65295f15c76a (patch) | |
| tree | d0bdde712d764aafb92d8f247e448d56dd9edfa3 /intern | |
| parent | 1f5c5fa189db8d5d505246dc7e905a796d21ce22 (diff) | |
Code cleanup: fix compiler warning.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/mesh.cpp | 5 | ||||
| -rw-r--r-- | intern/cycles/render/mesh.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index 7d5a0e451d0..7cfbb7b7c7d 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -899,7 +899,7 @@ void Mesh::pack_shaders(Scene *scene, uint *tri_shader) } } -void Mesh::pack_normals(Scene *scene, float4 *vnormal) +void Mesh::pack_normals(float4 *vnormal) { Attribute *attr_vN = attributes.find(ATTR_STD_VERTEX_NORMAL); if(attr_vN == NULL) { @@ -1777,8 +1777,7 @@ void MeshManager::device_update_mesh(Device *, foreach(Mesh *mesh, scene->meshes) { mesh->pack_shaders(scene, &tri_shader[mesh->tri_offset]); - mesh->pack_normals(scene, - &vnormal[mesh->vert_offset]); + mesh->pack_normals(&vnormal[mesh->vert_offset]); mesh->pack_verts(tri_prim_index, &tri_vindex[mesh->tri_offset], &tri_patch[mesh->tri_offset], diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h index 03a419e77f2..e370f8a2021 100644 --- a/intern/cycles/render/mesh.h +++ b/intern/cycles/render/mesh.h @@ -280,7 +280,7 @@ public: void add_undisplaced(); void pack_shaders(Scene *scene, uint *shader); - void pack_normals(Scene *scene, float4 *vnormal); + void pack_normals(float4 *vnormal); void pack_verts(const vector<uint>& tri_prim_index, uint4 *tri_vindex, uint *tri_patch, |