sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Code cleanup: fix compiler warning.

Browse Source
This commit is contained in:
Brecht Van Lommel 2018-03-10 06:51:52 +01:00
parent 1f5c5fa189
commit 8a76f8dac3
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/render/mesh.cpp
View File

@ -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); Attribute *attr_vN = attributes.find(ATTR_STD_VERTEX_NORMAL);
if(attr_vN == NULL) { if(attr_vN == NULL) {
@ -1777,8 +1777,7 @@ void MeshManager::device_update_mesh(Device *,
foreach(Mesh *mesh, scene->meshes) { foreach(Mesh *mesh, scene->meshes) {
mesh->pack_shaders(scene, mesh->pack_shaders(scene,
&tri_shader[mesh->tri_offset]); &tri_shader[mesh->tri_offset]);
mesh->pack_normals(scene, mesh->pack_normals(&vnormal[mesh->vert_offset]);
&vnormal[mesh->vert_offset]);
mesh->pack_verts(tri_prim_index, mesh->pack_verts(tri_prim_index,
&tri_vindex[mesh->tri_offset], &tri_vindex[mesh->tri_offset],
&tri_patch[mesh->tri_offset], &tri_patch[mesh->tri_offset],

2
intern/cycles/render/mesh.h
View File

@ -280,7 +280,7 @@ public:
void add_undisplaced(); void add_undisplaced();
void pack_shaders(Scene *scene, uint *shader); 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, void pack_verts(const vector<uint>& tri_prim_index,
uint4 *tri_vindex, uint4 *tri_vindex,
uint *tri_patch, uint *tri_patch,