diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-02-12 17:48:04 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-02-12 17:48:04 +0400 |
commit | 45c70acd2772fa9716b3116dbe2ffba5aab42cd3 (patch) | |
tree | bc116e269e0132e0c517f62ca03008efaac668fd /intern | |
parent | b3b993127681eac85c88d1cd7ceb0e235b54bdb8 (diff) |
Fix some (quite harmless) use of uninitialized memory reported by valgrind.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/bvh/bvh.cpp | 6 | ||||
-rw-r--r-- | intern/cycles/render/buffers.cpp | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp index 011406344ea..500b07f755b 100644 --- a/intern/cycles/bvh/bvh.cpp +++ b/intern/cycles/bvh/bvh.cpp @@ -340,6 +340,10 @@ void BVH::pack_primitives() Object *ob = objects[tob]; pack.prim_visibility[i] = ob->visibility; } + else { + memset(&pack.tri_woop[i * nsize], 0, sizeof(float4)*3); + pack.prim_visibility[i] = 0; + } } } @@ -476,7 +480,7 @@ void BVH::pack_instances(size_t nodes_size) } /* merge nodes */ - if( bvh->pack.nodes.size()) { + if(bvh->pack.nodes.size()) { size_t nsize_bbox = (use_qbvh)? nsize-2: nsize-1; int4 *bvh_nodes = &bvh->pack.nodes[0]; size_t bvh_nodes_size = bvh->pack.nodes.size(); diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp index 3b61ccd176d..572cfae45cd 100644 --- a/intern/cycles/render/buffers.cpp +++ b/intern/cycles/render/buffers.cpp @@ -83,6 +83,7 @@ RenderTile::RenderTile() w = 0; h = 0; + sample = 0; start_sample = 0; num_samples = 0; resolution = 0; |