Commit: 8a76f8dac3475b1d24956e0d384d65295f15c76a
Author: Brecht Van Lommel
Date: Sat Mar 10 06:51:52 2018 +0100
Branches: master
https://developer.blender.org/rB8a76f8dac3475b1d24956e0d384d65295f15c76a
Code cleanup: fix compiler warning.
===================================================================
M intern/cycles/render/mesh.cpp
M intern/cycles/render/mesh.h
===================================================================
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,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
